Skip to content

Restore src/tests packages in one-shot #126405

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

Merged
jkoritzinsky merged 3 commits into from
Apr 1, 2026
Merged

Restore src/tests packages in one-shot #126405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e9bf7e
Restore src/tests packages in one-shot
am11 Apr 1, 2026
5397fa9
Add restore.projects.props
am11 Apr 1, 2026
7b49227
Add restore.proj
am11 Apr 1, 2026
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
45 changes: 10 additions & 35 deletions src/tests/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.props" />
<Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets" />
<Import Project="restore.projects.props" />

<PropertyGroup>
<XunitTestBinBase Condition="'$(XunitTestBinBase)'==''" >$(BaseOutputPathWithConfig)</XunitTestBinBase>
Expand All @@ -23,27 +24,6 @@
<DisabledTestDir Include="TestWrappers" />
</ItemGroup>

<ItemGroup>
<RestoreProjects Include="Common\test_dependencies_fs\test_dependencies.fsproj" />
<RestoreProjects Include="Common\test_dependencies\test_dependencies.csproj" />
<RestoreProjects Include="Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" />
<RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_Arm.csproj" />
<RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_General.csproj" />
<RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_X86.csproj" />
<RestoreProjects Include="Common\XUnitLogChecker\XUnitLogChecker.csproj"
Condition="$(IsXUnitLogCheckerSupported)">
<!-- XUnitLogChecker is published as AOT, so it needs the current RID. The RID may change during the build.
This flag will force restore to use the latest RuntimeIdentifier property. -->
<ForceRestore>true</ForceRestore>
</RestoreProjects>
<RestoreProjects Include="Common\XUnitWrapperGenerator\XUnitWrapperGenerator.csproj" />
<RestoreProjects Include="Common\XUnitWrapperLibrary\XUnitWrapperLibrary.csproj" />
<RestoreProjects Include="Common\XHarnessRunnerLibrary\XHarnessRunnerLibrary.csproj" />
<RestoreProjects Include="Common\external\external.csproj" />
<RestoreProjects Include="Common\ilasm\ilasm.ilproj" />
<RestoreProjects Include="tracing\userevents\common\userevents_common.csproj" />
</ItemGroup>

<ItemGroup>
<TestBuildSteps Include="RestorePackages" />
<TestBuildSteps Include="ManagedBuild" />
Expand Down Expand Up @@ -191,22 +171,17 @@
<Target Name="BatchRestorePackages">
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." />

<!-- restore all csproj's with PackageReferences in one pass -->
<MSBuild Projects="build.proj"
Properties="RestoreProj=%(RestoreProjects.Identity);_ForceRestore=%(RestoreProjects.ForceRestore)"
Targets="RestorePackage" />

<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." />
</Target>

<Target Name="RestorePackage">
<PropertyGroup>
<_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
<_ConfigurationProperties Condition="'$(UseLocalAppHostPack)' == 'true' or '$(TargetOS)' == 'browser'">$(_ConfigurationProperties) -p:EnableAppHostPackDownload=false -p:EnableTargetingPackDownload=false -p:EnableRuntimePackDownload=false</_ConfigurationProperties>
<_ForceRestore Condition="'$(_ForceRestore)' == 'true'">-f</_ForceRestore>
<DotnetRestoreCommand>"$(DotNetTool)" restore $(_ForceRestore) -r $(RuntimeIdentifier) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true /p:RuntimeIdentifier=$(RuntimeIdentifier) $(_ConfigurationProperties)</DotnetRestoreCommand>
<_RestoreProperties>MSBuildRestoreSessionId=$([System.Guid]::NewGuid());TargetOS=$(TargetOS);TargetArchitecture=$(TargetArchitecture);Configuration=$(Configuration);CrossBuild=$(CrossBuild);SetTFMForRestore=true;RuntimeIdentifier=$(RuntimeIdentifier)</_RestoreProperties>
<_RestoreProperties Condition="'$(UseLocalAppHostPack)' == 'true' or '$(TargetOS)' == 'browser'">$(_RestoreProperties);EnableAppHostPackDownload=false;EnableTargetingPackDownload=false;EnableRuntimePackDownload=false</_RestoreProperties>
</PropertyGroup>
<Exec Command="$(DotnetRestoreCommand)"/>

<!-- Use a dedicated traversal project to restore all test dependencies in one graph invocation. -->
<MSBuild Projects="restore.proj"
Targets="Restore"
Properties="$(_RestoreProperties)" />

<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." />
</Target>

<!-- Override RestorePackages from dir.traversal.targets and do a batch restore -->
Expand Down
7 changes: 7 additions & 0 deletions src/tests/restore.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.Build.Traversal">
<Import Project="restore.projects.props" />

<ItemGroup>
<ProjectReference Include="@(RestoreProjects)" />
</ItemGroup>
</Project>
17 changes: 17 additions & 0 deletions src/tests/restore.projects.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<ItemGroup>
<RestoreProjects Include="Common\test_dependencies_fs\test_dependencies.fsproj" />
<RestoreProjects Include="Common\test_dependencies\test_dependencies.csproj" />
<RestoreProjects Include="Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" />
<RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_Arm.csproj" />
<RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_General.csproj" />
<RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_X86.csproj" />
<RestoreProjects Include="Common\XUnitLogChecker\XUnitLogChecker.csproj" Condition="$(IsXUnitLogCheckerSupported)" />
<RestoreProjects Include="Common\XUnitWrapperGenerator\XUnitWrapperGenerator.csproj" />
<RestoreProjects Include="Common\XUnitWrapperLibrary\XUnitWrapperLibrary.csproj" />
<RestoreProjects Include="Common\XHarnessRunnerLibrary\XHarnessRunnerLibrary.csproj" />
<RestoreProjects Include="Common\external\external.csproj" />
<RestoreProjects Include="Common\ilasm\ilasm.ilproj" />
<RestoreProjects Include="tracing\userevents\common\userevents_common.csproj" />
</ItemGroup>
</Project>
Loading