Skip to content

Commit deb09dd

Browse files
committed
Set BuildHostTools after NETCoreSdkRuntimeIdentifier has been set by the SDK (it's not set before Subsets.props)
1 parent 4de59c4 commit deb09dd

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@
498498
<PropertyGroup>
499499
<CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
500500
<CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
501+
<AfterMicrosoftNetSdkProps>$(AfterMicrosoftNetSdkProps);$(RepositoryEngineeringDir)NetSdk.AfterProps.props</AfterMicrosoftNetSdkProps>
501502
</PropertyGroup>
502503

503504
<PropertyGroup>

eng/NetSdk.AfterProps.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<!--
3+
Set properties based on the SDK's RID here. Setting the properties here will ensure they're available during property evaulation in project files
4+
and during item evaluation everywhere.
5+
-->
6+
<PropertyGroup>
7+
<BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
8+
</PropertyGroup>
9+
</Project>

eng/Subsets.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,6 @@
576576
<_BuildNativeAOTRuntimePack Condition="'$(BuildNativeAOTRuntimePack)' == 'true'">true</_BuildNativeAOTRuntimePack>
577577
<_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true' and '$(BuildNativeAOTRuntimePack)' != 'true'">true</_BuildHostPack>
578578
<_BuildBundle Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
579-
<BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
580579
</PropertyGroup>
581580

582581
<PropertyGroup Condition="'$(DotNetBuildAllRuntimePacks)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'">

0 commit comments

Comments
 (0)