Skip to content

Commit 5feaad5

Browse files
Fix for PackAsToolShimRuntimeIdentifiers property in VMR builds (#60503)
1 parent 48d9b82 commit 5feaad5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Tools/Directory.Build.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project>
22
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
33
<!-- Microsoft tool packages are required to target both x64 and x86. -->
4-
<PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(TargetOsName)' == 'win' ">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
4+
<!-- In VMR builds we only use the current RID. -->
5+
<PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuild)' != 'true' ">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
6+
<PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' ">$(TargetRid)</PackAsToolShimRuntimeIdentifiers>
57
<!-- None of the tool projects are project reference providers. -->
68
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
79
<!--

0 commit comments

Comments
 (0)