Skip to content

Commit 297a926

Browse files
max-charlambmax-charlamb
authored
Move dotnet-test into the artifacts folder (#5602)
* moved the dotnet install from root to `/artifacts/dotnet-test` which can be packaged and sent up to helix
1 parent 05321bc commit 297a926

File tree

11 files changed

+85
-83
lines changed

11 files changed

+85
-83
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,13 @@
2929
$(TargetRid) - the runtime identifier (rid) to against (win-x64, linux-arm64, linux-musl-x64, etc).
3030
$(Configuration) - configuration to test (Debug, Release). Defaults to Debug.
3131
$(ArtifactsBinDir) - artifacts\bin directory
32+
$(ArtifactsDotnetTestDir) - artifacts\dotnet-test directory
3233
-->
3334

35+
<PropertyGroup>
36+
<ArtifactsDotnetTestDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'dotnet-test'))</ArtifactsDotnetTestDir>
37+
</PropertyGroup>
38+
3439
<PropertyGroup Condition="'$(TargetOS)' == ''">
3540
<TargetOS>linux</TargetOS>
3641
<TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">Windows_NT</TargetOS>

‎eng/InstallRuntimes.proj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@
1616
$(RepoRoot) - the root of the diagnostics repo
1717
$(RepositoryEngineeringDir) - the "eng" directory
1818
$(VersionsPropsPath) - path of Versions.props
19+
20+
From Directory.Build.props:
21+
$(ArtifactsDotnetTestDir) - artifacts\dotnet-test directory
1922
-->
2023

2124
<PropertyGroup>
2225
<LiveRuntimeDir Condition="'$(LiveRuntimeDir)' != ''">$([MSBuild]::NormalizePath('$(LiveRuntimeDir)'))</LiveRuntimeDir>
26+
<DotNetInstallRoot>$(ArtifactsDotnetTestDir)</DotNetInstallRoot>
2327
</PropertyGroup>
2428

2529
<PropertyGroup Condition="'$(TargetArch)' != 'x86'">
26-
<DotNetInstallRoot>$(RepoRoot).dotnet-test\</DotNetInstallRoot>
2730
<RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE</RegistryRoot>
2831
</PropertyGroup>
2932

3033
<PropertyGroup Condition="'$(TargetArch)' == 'x86'">
31-
<DotNetInstallRoot>$(RepoRoot).dotnet-test\x86\</DotNetInstallRoot>
3234
<RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node</RegistryRoot>
3335
</PropertyGroup>
3436

‎src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99

1010
<Configuration>
1111
<Import ConfigFile="Debugger.Tests.Common.txt" />
12-
<DotNetRoot>$(RepoRootDir)/.dotnet-test</DotNetRoot>
12+
<DotNetRoot>$(ArtifactsDir)/dotnet-test</DotNetRoot>
1313
<Import ConfigFile="$(DotNetRoot)/Debugger.Tests.Versions.txt" />
1414

1515
<TestProduct>ProjectK</TestProduct>
1616
<ScriptRootDir>$(RepoRootDir)/src/SOS/SOS.UnitTests/Scripts</ScriptRootDir>
17-
<RootBinDir>$(RepoRootDir)/artifacts</RootBinDir>
18-
<InstallDir>$(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
19-
<LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp)</LogDir>
20-
<DumpDir>$(RootBinDir)/tmp/$(TargetConfiguration)\dumps</DumpDir>
17+
<InstallDir>$(ArtifactsDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
18+
<LogDir>$(ArtifactsDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp)</LogDir>
19+
<DumpDir>$(ArtifactsDir)/tmp/$(TargetConfiguration)\dumps</DumpDir>
2120

2221
<SetHostExe>true</SetHostExe>
2322
<SetFxVersion>true</SetFxVersion>
@@ -31,7 +30,7 @@
3130
<DebuggeeSourceRoot>$(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees</DebuggeeSourceRoot>
3231
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
3332
<DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
34-
<DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>
33+
<DebuggeeBuildRoot>$(ArtifactsDir)</DebuggeeBuildRoot>
3534

3635
<CliPath>$(DotNetRoot)/dotnet</CliPath>
3736

@@ -43,31 +42,31 @@
4342
<Options>
4443
<Option Condition="'$(RuntimeVersionLatest)' != ''">
4544
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
46-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
45+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
4746
<PublishSingleFile>true</PublishSingleFile>
4847
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
4948
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
5049
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
5150
</Option>
5251
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
5352
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
54-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
53+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
5554
<PublishSingleFile>true</PublishSingleFile>
5655
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
5756
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
5857
<BuildProjectFramework>$(TargetFrameworkServicing1)</BuildProjectFramework>
5958
</Option>
6059
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
6160
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
62-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
61+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
6362
<PublishSingleFile>true</PublishSingleFile>
6463
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
6564
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
6665
<BuildProjectFramework>$(TargetFrameworkServicing2)</BuildProjectFramework>
6766
</Option>
6867
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
6968
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
70-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
69+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
7170
<PublishSingleFile>true</PublishSingleFile>
7271
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
7372
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
@@ -104,42 +103,42 @@
104103
<TestName>SOS.TestExtensions</TestName>
105104
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
106105
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
107-
<DotNetDiagnosticExtensions>$(RootBinDir)/bin/TestExtension/$(TargetConfiguration)/netstandard2.0/TestExtension.dll</DotNetDiagnosticExtensions>
106+
<DotNetDiagnosticExtensions>$(ArtifactsDir)/bin/TestExtension/$(TargetConfiguration)/netstandard2.0/TestExtension.dll</DotNetDiagnosticExtensions>
108107
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
109108
</Option>
110109
<!--
111110
SOS.StackAndOtherTests (cli because tested with embedded, portable PDBs and single-file)
112111
-->
113112
<Option>
114113
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
115-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees</DebuggeeBuildRoot>
114+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees</DebuggeeBuildRoot>
116115
<TestName>SOS.StackAndOtherTests</TestName>
117116
<Options>
118117
<Option Condition="'$(TestSingleFile)' == 'true'">
119118
<Options>
120119
<Option Condition="'$(RuntimeVersionLatest)' != ''">
121-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
120+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
122121
<PublishSingleFile>true</PublishSingleFile>
123122
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
124123
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
125124
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
126125
</Option>
127126
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
128-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
127+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
129128
<PublishSingleFile>true</PublishSingleFile>
130129
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
131130
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
132131
<BuildProjectFramework>$(TargetFrameworkServicing1)</BuildProjectFramework>
133132
</Option>
134133
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
135-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
134+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
136135
<PublishSingleFile>true</PublishSingleFile>
137136
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
138137
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
139138
<BuildProjectFramework>$(TargetFrameworkServicing2)</BuildProjectFramework>
140139
</Option>
141140
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
142-
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
141+
<DebuggeeBuildRoot>$(ArtifactsDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
143142
<PublishSingleFile>true</PublishSingleFile>
144143
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
145144
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
@@ -221,7 +220,7 @@
221220
</Options>
222221

223222
<DotNetDumpHost>$(DotNetRoot)/dotnet</DotNetDumpHost>
224-
<DotNetDumpPath>$(RootBinDir)/bin/dotnet-dump/$(TargetConfiguration)/$(NetCoreAppMinTargetFramework)/publish/dotnet-dump.dll</DotNetDumpPath>
223+
<DotNetDumpPath>$(ArtifactsDir)/bin/dotnet-dump/$(TargetConfiguration)/$(NetCoreAppMinTargetFramework)/publish/dotnet-dump.dll</DotNetDumpPath>
225224
<DebuggeeDumpOutputRootDir>$(DumpDir)/$(TestProduct)/$(RuntimeFrameworkVersion)/$(BuildProjectFramework)</DebuggeeDumpOutputRootDir>
226225
<DebuggeeDumpInputRootDir>$(DebuggeeDumpOutputRootDir)</DebuggeeDumpInputRootDir>
227226

‎src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99

1010
<Configuration>
1111
<Import ConfigFile="Debugger.Tests.Common.txt" />
12-
<DotNetRoot Condition="'$(TargetArchitecture)' != 'x86'">$(RepoRootDir)\.dotnet-test</DotNetRoot>
13-
<DotNetRoot Condition="'$(TargetArchitecture)' == 'x86'">$(RepoRootDir)\.dotnet-test\x86</DotNetRoot>
12+
<DotNetRoot>$(ArtifactsDir)\dotnet-test</DotNetRoot>
1413
<Import ConfigFile="$(DotNetRoot)\Debugger.Tests.Versions.txt" />
1514

1615
<ScriptRootDir>$(RepoRootDir)\src\SOS\SOS.UnitTests\Scripts</ScriptRootDir>
17-
<RootBinDir>$(RepoRootDir)\artifacts</RootBinDir>
18-
<InstallDir>$(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
19-
<LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp)</LogDir>
20-
<DumpDir>$(RootBinDir)\tmp\$(TargetConfiguration)\dumps</DumpDir>
16+
<InstallDir>$(ArtifactsDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
17+
<LogDir>$(ArtifactsDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp)</LogDir>
18+
<DumpDir>$(ArtifactsDir)\tmp\$(TargetConfiguration)\dumps</DumpDir>
2119
<CDBHelperExtension>$(InstallDir)\runcommand.dll</CDBHelperExtension>
2220
<MicrosoftNETCoreAppPath>$(DotNetRoot)\shared\Microsoft.NETCore.App\</MicrosoftNETCoreAppPath>
2321

@@ -41,7 +39,7 @@
4139
<DebuggeeSourceRoot>$(RepoRootDir)\src\SOS\SOS.UnitTests\Debuggees</DebuggeeSourceRoot>
4240
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
4341
<DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
44-
<DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>
42+
<DebuggeeBuildRoot>$(ArtifactsDir)</DebuggeeBuildRoot>
4543

4644
<CliPath>$(DotNetRoot)\dotnet.exe</CliPath>
4745

@@ -59,31 +57,31 @@
5957
<Options>
6058
<Option Condition="'$(RuntimeVersionLatest)' != ''">
6159
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
62-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
60+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
6361
<PublishSingleFile>true</PublishSingleFile>
6462
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
6563
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
6664
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
6765
</Option>
6866
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
6967
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
70-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
68+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
7169
<PublishSingleFile>true</PublishSingleFile>
7270
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
7371
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
7472
<BuildProjectFramework>$(TargetFrameworkServicing1)</BuildProjectFramework>
7573
</Option>
7674
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
7775
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
78-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
76+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
7977
<PublishSingleFile>true</PublishSingleFile>
8078
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
8179
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
8280
<BuildProjectFramework>$(TargetFrameworkServicing2)</BuildProjectFramework>
8381
</Option>
8482
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
8583
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
86-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
84+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
8785
<PublishSingleFile>true</PublishSingleFile>
8886
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
8987
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
@@ -120,7 +118,7 @@
120118
<TestName>SOS.TestExtensions</TestName>
121119
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
122120
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
123-
<DotNetDiagnosticExtensions>$(RootBinDir)\bin\TestExtension\$(TargetConfiguration)\netstandard2.0\TestExtension.dll</DotNetDiagnosticExtensions>
121+
<DotNetDiagnosticExtensions>$(ArtifactsDir)\bin\TestExtension\$(TargetConfiguration)\netstandard2.0\TestExtension.dll</DotNetDiagnosticExtensions>
124122
<Options>
125123
<Option>
126124
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
@@ -135,35 +133,35 @@
135133
-->
136134
<Option>
137135
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
138-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
136+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees</DebuggeeBuildRoot>
139137
<TestName>SOS.StackAndOtherTests</TestName>
140138
<Options>
141139
<Option Condition="'$(TestSingleFile)' == 'true'">
142140
<Options>
143141
<Option Condition="'$(RuntimeVersionLatest)' != ''">
144-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
142+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
145143
<PublishSingleFile>true</PublishSingleFile>
146144
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
147145
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
148146
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
149147
<BuildType>Nightly</BuildType>
150148
</Option>
151149
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
152-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
150+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
153151
<PublishSingleFile>true</PublishSingleFile>
154152
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
155153
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
156154
<BuildProjectFramework>$(TargetFrameworkServicing1)</BuildProjectFramework>
157155
</Option>
158156
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
159-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
157+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
160158
<PublishSingleFile>true</PublishSingleFile>
161159
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
162160
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
163161
<BuildProjectFramework>$(TargetFrameworkServicing2)</BuildProjectFramework>
164162
</Option>
165163
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
166-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
164+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
167165
<PublishSingleFile>true</PublishSingleFile>
168166
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
169167
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
@@ -202,7 +200,7 @@
202200
<TestName>SOS.DualRuntimes</TestName>
203201
<SetSymbolServer>-ms -timeout 10</SetSymbolServer>
204202
<!-- The assembly path, class and function name of the desktop test code to load/run -->
205-
<DesktopTestParameters>$(RootBinDir)\bin\SymbolTestDll\$(TargetConfiguration)\$(DesktopFramework)\SymbolTestDll.dll SymbolTestDll.TestClass ThrowException</DesktopTestParameters>
203+
<DesktopTestParameters>$(ArtifactsDir)\bin\SymbolTestDll\$(TargetConfiguration)\$(DesktopFramework)\SymbolTestDll.dll SymbolTestDll.TestClass ThrowException</DesktopTestParameters>
206204
</Option>
207205
</Options>
208206
<Options>
@@ -211,7 +209,7 @@
211209
<TestWebApp3_SingleFile Condition="'$(RuntimeVersionLatest)' == ''">false</TestWebApp3_SingleFile>
212210
<Option Condition="'$(TestWebApp3_SingleFile)' == 'true'">
213211
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
214-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
212+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
215213
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
216214
<BuildProjectFramework>$(TargetFrameworkLatest)</BuildProjectFramework>
217215
<PublishSingleFile>true</PublishSingleFile>
@@ -270,7 +268,7 @@
270268
</Options>
271269
<TestProduct>Desktop</TestProduct>
272270
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
273-
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
271+
<DebuggeeBuildRoot>$(ArtifactsDir)\Debuggees</DebuggeeBuildRoot>
274272
<BuildProjectFramework>$(DesktopFramework)</BuildProjectFramework>
275273
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
276274
<DebugType>full</DebugType>
@@ -285,7 +283,7 @@
285283

286284
<SOSPath>$(InstallDir)\sos.dll</SOSPath>
287285
<DotNetDumpHost>$(DotNetRoot)\dotnet.exe</DotNetDumpHost>
288-
<DotNetDumpPath>$(RootBinDir)\bin\dotnet-dump\$(TargetConfiguration)\$(NetCoreAppMinTargetFramework)\publish\dotnet-dump.dll</DotNetDumpPath>
286+
<DotNetDumpPath>$(ArtifactsDir)\bin\dotnet-dump\$(TargetConfiguration)\$(NetCoreAppMinTargetFramework)\publish\dotnet-dump.dll</DotNetDumpPath>
289287
<DebuggeeDumpOutputRootDir>$(DumpDir)\$(TestProduct)\$(RuntimeFrameworkVersion)\$(BuildProjectFramework)</DebuggeeDumpOutputRootDir>
290288
<DebuggeeDumpInputRootDir>$(DebuggeeDumpOutputRootDir)</DebuggeeDumpInputRootDir>
291289
</Configuration>

‎src/SOS/SOS.UnitTests/SOS.UnitTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<DesktopFramework>$(DesktopTargetFramework)</DesktopFramework>
4848
<NetCoreAppMinTargetFramework>$(NetCoreAppMinTargetFramework)</NetCoreAppMinTargetFramework>
4949
<RepoRootDir>$(RepoRoot)</RepoRootDir>
50+
<ArtifactsDir>$(ArtifactsDir)</ArtifactsDir>
5051
<CDBPath>$(NuGetPackageRoot)cdb-sos\$(cdbsosversion)\runtimes\win-%24(TargetArchitecture)\native\cdb.exe</CDBPath>
5152
</Configuration>
5253
]]>

0 commit comments

Comments
 (0)