Skip to content

Commit 111ceb8

Browse files
authored
Enable building projects during BuildPass=2 in dotnet/runtime (#112201)
* Enable building projects during BuildPass=2 in dotnet/runtime * Only provide the DotNetBuildPass=2 variant when actually in that build pass * Use TargetOS/Arch instead (we don't have TargetRID available at this time in Build.proj)
1 parent 9c2bfb9 commit 111ceb8

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

eng/Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<ProjectToBuild Include="$(RepoRoot)Build.proj" />
8+
<!-- dotnet/runtime controls which projects run in which passes through our DefaultSubsets settings in eng/Subsets.props -->
9+
<ProjectToBuild Include="$(RepoRoot)Build.proj" DotNetBuildPass="2" Condition="'$(DotNetBuildPass)' == '2'" />
810
</ItemGroup>
911
</Project>

eng/Subsets.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<DefaultSubsets Condition="'$(DotNetBuildMonoCrossAOT)' == 'true'">mono+packs</DefaultSubsets>
7070

7171
<!-- In the Win-x86 BuildPass2 job in the VMR, we want to build the cross-OS DACs and pack them. -->
72-
<DefaultSubsets Condition="'$(DotNetBuildPass)' == '2' and '$(TargetRid)' == 'win-x86'">crossdacpack</DefaultSubsets>
72+
<DefaultSubsets Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86'">crossdacpack</DefaultSubsets>
7373
</PropertyGroup>
7474

7575
<PropertyGroup>

0 commit comments

Comments
 (0)