From 30288fb84f4a1e0f67bc13dcc7fd9083ab67f23a Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 19 Feb 2025 11:04:50 -0800
Subject: [PATCH] Fix for PackAsToolShimRuntimeIdentifiers property in VMR
 builds

---
 src/Tools/Directory.Build.targets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
index 79ede63cd7ec..e466dde83950 100644
--- a/src/Tools/Directory.Build.targets
+++ b/src/Tools/Directory.Build.targets
@@ -1,7 +1,9 @@
 <Project>
   <PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
     <!-- Microsoft tool packages are required to target both x64 and x86. -->
-    <PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(TargetOsName)' == 'win' ">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
+    <!-- In VMR builds we only use the current RID. -->
+    <PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuild)' != 'true' ">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
+    <PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' ">$(TargetRid)</PackAsToolShimRuntimeIdentifiers>
     <!-- None of the tool projects are project reference providers. -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
     <!--