Skip to content

Move tests and test debuggees to repo root 'tests' directory #5554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

Move tests and test debuggees to repo root 'tests' directory #5554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8186c59
Move tests and test debuggees to repo root 'tests' directory
Apr 26, 2025
ad7cdcd
Remove debuggee from DbgShim.UnitTest project
Apr 28, 2025
1f9a870
Everything under the tests directory is not packable
Apr 29, 2025
93a5efa
Fix packing in official build
Apr 30, 2025
a57bf97
Fix single-file build step
Apr 30, 2025
b8315c8
Merge remote-tracking branch 'upstream/main' into organize_tests
steveisok Jul 18, 2025
cd2e7d8
Merge remote-tracking branch 'upstream/main' into organize_tests
steveisok Aug 5, 2025
aebac9c
Split out build tools and tests from running them
steveisok Aug 5, 2025
7c06f2d
Use -withtests instead because powershell doesn't seem to like prefix…
steveisok Aug 5, 2025
b118af2
WIP - DbgShim.UnitTests can run outside of the repo with a few tweaks…
steveisok Aug 25, 2025
2a8905b
Merge remote-tracking branch 'upstream/main' into organize_tests
steveisok Aug 25, 2025
6eecb79
fix paths
max-charlamb Aug 27, 2025
37097ef
Merge branch 'main' into organize_tests2
max-charlamb Aug 28, 2025
878a01a
modify build.proj
max-charlamb Aug 28, 2025
56fd8e8
fix source-build
max-charlamb Aug 28, 2025
2ed0c53
support helix in build.ps1
max-charlamb Aug 28, 2025
1c87d1c
remove references to helix
max-charlamb Aug 28, 2025
418570a
remove helix references
max-charlamb Aug 28, 2025
5dc3574
modify cli arguments
max-charlamb Aug 29, 2025
12da84a
Update eng/build.ps1
max-charlamb Aug 29, 2025
4d0b29f
fix pipeline
max-charlamb Aug 29, 2025
7a4f23e
undo change
max-charlamb Aug 29, 2025
73ff521
Move tests into src/tests and adjust any pathing weirdness
steveisok Sep 4, 2025
a6e0aaf
Add binaries and other ignored files that were in tree back
steveisok Sep 4, 2025
f615832
Merge remote-tracking branch 'upstream/main' into organize_tests2
steveisok Sep 4, 2025
8b10fe4
Correct lldbplugin.tests location
steveisok Sep 4, 2025
ac4805a
Revert changes intended for running tests standalone
steveisok Sep 29, 2025
cd7353b
Rename .UnitTests to .Tests
steveisok Sep 30, 2025
da813d8
Merge remote-tracking branch 'origin/main' into organize_tests2
max-charlamb Oct 8, 2025
6cd41d8
fix merge issues
max-charlamb Oct 8, 2025
cdd9731
fix slnx file
max-charlamb Oct 8, 2025
17d0633
Add back test binaries
steveisok Oct 8, 2025
5c4e284
update .gitignore to ignore dirs.slnx
max-charlamb Oct 8, 2025
521f47d
use slngen/dirs.proj for build
max-charlamb Oct 8, 2025
a61dae8
reduce diff
max-charlamb Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.vs/
*.VC.db
.venv/
dirs.slnx

# Build results
[Aa]rtifacts/
Expand Down
12 changes: 12 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
<LangVersion>Latest</LangVersion>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
<IsShipping>false</IsShipping>
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -67,4 +70,13 @@
<SupportedXUnitTestTargetFrameworks>net8.0</SupportedXUnitTestTargetFrameworks>
</PropertyGroup>

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

<PropertyGroup Condition="'$(TargetArch)' == 'x86'">
<DotNetInstallRoot>$(RepoRoot).dotnet-test\x86\</DotNetInstallRoot>
<RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node</RegistryRoot>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,7 @@ SOFTWARE.

-------------------------------------------------

Source in src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source
Source in src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source
source found at https://github.com/xunit/samples.xunit.

This set of code is covered by the following license:
Expand Down
101 changes: 22 additions & 79 deletions debuggees.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,84 +10,27 @@
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/src/" />
<Folder Name="/src/SOS/" />
<Folder Name="/src/SOS/Debuggees/">
<Project Path="src/SOS/lldbplugin.tests/TestDebuggee/TestDebuggee.csproj">
<BuildType Solution="Checked|*" Project="Release" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/DynamicMethod/DynamicMethod.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/DumpGCData/DumpGCData.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
</Project>
<Folder Name="/tests/Debuggees/">
<Project Path="src/tests/Debuggees/DivZero/DivZero.csproj"/>
<Project Path="src/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj"/>
<Project Path="src/tests/Debuggees/DynamicMethod/DynamicMethod.csproj"/>
<Project Path="src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj"/>
<Project Path="src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj"/>
<Project Path="src/tests/Debuggees/GCPOH/GCPOH.csproj"/>
<Project Path="src/tests/Debuggees/GCWhere/GCWhere.csproj"/>
<Project Path="src/tests/Debuggees/LineNums/LineNums.csproj"/>
<Project Path="src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj"/>
<Project Path="src/tests/Debuggees/Overflow/Overflow.csproj"/>
<Project Path="src/tests/Debuggees/ReflectionTest/ReflectionTest.csproj"/>
<Project Path="src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj"/>
<Project Path="src/tests/Debuggees/SimpleThrow/SimpleThrow.csproj"/>
<Project Path="src/tests/Debuggees/StackTracee/StackTracee.csproj"/>
<Project Path="src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj"/>
<Project Path="src/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj"/>
<Project Path="src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj"/>
<Project Path="src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj"/>
<Project Path="src/tests/Debuggees/TestDebuggee/TestDebuggee.csproj"/>
<Project Path="src/tests/Debuggees/Tracee/Tracee.csproj"/>
<Project Path="src/tests/Debuggees/WebApp3/WebApp3.csproj"/>
</Folder>
</Solution>
46 changes: 23 additions & 23 deletions diagnostics.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj">
<BuildType Solution="Checked|*" Project="Release" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/Microsoft.Diagnostics.WebSocketServer/Microsoft.Diagnostics.WebSocketServer.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
Expand Down Expand Up @@ -320,10 +316,6 @@
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/SOS.UnitTests/SOS.UnitTests.csproj">
<BuildType Solution="Checked|*" Project="Release" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/SOS/Strike/Strike.vcxproj" Id="41f59d85-fc36-3015-861b-f177863252bc">
<Platform Project="x64" />
<Build Solution="*|Any CPU" Project="false" />
Expand Down Expand Up @@ -354,61 +346,69 @@
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj">
<Project Path="src/tests/DbgShim.Tests/DbgShim.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj">
<Project Path="src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/dotnet-stack/DotnetStack.UnitTests.csproj">
<Project Path="src/tests/DotnetStack.Tests/DotnetStack.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
<Build Solution="Debug|Any CPU" Project="false" />
<Build Solution="Release|*" Project="false" />
</Project>
<Project Path="src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj">
<Project Path="src/tests/DotnetTrace.Tests/DotnetTrace.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
</Project>
<Project Path="src/tests/eventpipe/EventPipe.UnitTests.csproj">
<Project Path="src/tests/EventPipe.Tests/EventPipe.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/EventPipeTracee/EventPipeTracee.csproj">
<Project Path="src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/ExitCodeTracee/ExitCodeTracee.csproj">
<Project Path="src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj">
<Project Path="src/tests/Microsoft.Diagnostics.DebugServices.Tests/Microsoft.Diagnostics.DebugServices.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj">
<Project Path="src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj">
<Project Path="src/tests/Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj">
<Project Path="src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/Microsoft.Diagnostics.NETCore.Client.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj">
<Project Path="src/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj">
<BuildType Solution="Checked|*" Project="Release" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj">
<Project Path="src/tests/Microsoft.SymbolStore.Tests/Microsoft.SymbolStore.Tests.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/StackTracee/StackTracee.csproj">
<Project Path="src/tests/SOS.Tests/SOS.Tests.csproj">
<BuildType Solution="Checked|*" Project="Release" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Debuggees/StackTracee/StackTracee.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
</Project>
Expand All @@ -420,7 +420,7 @@
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Release" />
</Project>
<Project Path="src/tests/Tracee/Tracee.csproj">
<Project Path="src/tests/Debuggees/Tracee/Tracee.csproj">
<BuildType Solution="Checked|*" Project="Debug" />
<BuildType Solution="RelWithDebInfo|*" Project="Debug" />
</Project>
Expand Down
12 changes: 12 additions & 0 deletions dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.Build.Traversal">

<ItemGroup>
<ProjectReference Include="src/dirs.proj" Condition="'$(BundleTools)' != 'true' and '$(DotNetBuild)' != 'true'" />
<ProjectReference Include="src/tests/dirs.proj" Condition="'$(BundleTools)' != 'true' and '$(DotNetBuild)' != 'true'" />

<ProjectReference Include="src/singlefile-tools.proj" Condition="'$(BundleTools)' == 'true'" />

<!-- Only build the NETCore.Client library in .NET product build mode. -->
<ProjectReference Include="src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj" Condition="'$(DotNetBuild)' == 'true'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion documentation/privatebuildtesting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Here are some instructions on how to run the diagnostics repo's tests against a
4. On Windows 11 (this doesn't work on Windows 10), add the following DWORD registry key: `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings\DisableAuxProviderSignatureCheck` and set it to 1. This allows the unsigned privately built DAC to be used to generate dumps.
5. Copy the private runtime binaries over the test SDK/runtimes installed in `.dotnet-test`. This step is hard to automate because there are usually 3 versions of the runtime installed: one as part of the .NET SDK, one as part of the AspNetCore runtime and one from latest runtime DARC update.
6. Run the diagnostics repo tests either:
a. `test.cmd` or `test.sh` - this runs all the diagnostics tests including SOS's. A html test report will be generated in `artifacts/TestResults/{Debug,Release}/SOS.UnitTests_net8.0_x64.html`.
a. `test.cmd` or `test.sh` - this runs all the diagnostics tests including SOS's. A html test report will be generated in `artifacts/TestResults/{Debug,Release}/SOS.Tests_net8.0_x64.html`.
b. Use the VS Test Explorer to run all the SOS tests or a specific one.
c. Use `eng\testsos.cmd` or `eng/testsos.sh` to run just the SOS tests. The html test report isn't generated in this case, but the SOS test logs are in artifacts/TestResults/{Debug,Release}/sos_*.

Expand Down
13 changes: 3 additions & 10 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project>

<!-- Only build the NETCore.Client library in .NET product build mode. -->
<ItemGroup Condition="'$(DotNetBuild)' == 'true'">
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj" />
<ItemGroup Condition="'$(DotNetBuild)' != 'true'">
<ProjectToBuild Include="$(RepoRoot)dirs.proj" />
</ItemGroup>

<ItemGroup Condition=" '$(BundleTools)' == 'true' ">
<ProjectToBuild Include="$(RepoRoot)src/singlefile-tools.proj" />
</ItemGroup>

</Project>
</Project>
10 changes: 0 additions & 10 deletions eng/InstallRuntimes.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@
<LiveRuntimeDir Condition="'$(LiveRuntimeDir)' != ''">$([MSBuild]::NormalizePath('$(LiveRuntimeDir)'))</LiveRuntimeDir>
</PropertyGroup>

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

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

<PropertyGroup>
<CommonInstallArgs>-NoPath -SkipNonVersionedFiles -Architecture $(TargetArch) -InstallDir $(DotNetInstallRoot)</CommonInstallArgs>
<DotNetInstallDir>$([MSBuild]::NormalizeDirectory('$(DotNetInstallRoot)', 'shared', 'Microsoft.NETCore.App', '$(MicrosoftNETCoreAppRefVersion)'))</DotNetInstallDir>
Expand Down
8 changes: 7 additions & 1 deletion eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Param(
[switch] $privatebuild,
[switch] $ci,
[switch][Alias('bl')]$binaryLog,
[switch] $skiptest,
[switch] $skipmanaged,
[switch] $skipnative,
[switch] $bundletools,
Expand Down Expand Up @@ -67,6 +68,10 @@ if (-not $skipnative) {

# Install sdk for building, restore and build managed components.
if (-not $skipmanaged) {
if (-not $skiptest) {
$remainingargs = "/p:BuildTests=true " + $remainingargs
}

Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity $bl /p:TargetOS=$os /p:TargetArch=$architecture /p:TestArchitectures=$architecture $remainingargs"

if ($lastExitCode -ne 0) {
Expand Down Expand Up @@ -111,7 +116,8 @@ if ($test) {
/p:DotnetRuntimeDownloadVersion="$dotnetruntimedownloadversion" `
/p:RuntimeSourceFeed="$runtimesourcefeed" `
/p:RuntimeSourceFeedKey="$runtimesourcefeedkey" `
/p:LiveRuntimeDir="$liveRuntimeDir"
/p:LiveRuntimeDir="$liveRuntimeDir" `
/p:IsTestRun=true

if ($lastExitCode -ne 0) {
exit $lastExitCode
Expand Down
Loading
Loading