From e50643ad501b9fe75910d492cdc03bb37eb08789 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:03:03 +0300
Subject: [PATCH] Use OutputRid in test projects

---
 src/tests/Common/ilasm/ilasm.ilproj                         | 2 +-
 src/tests/Common/publishdependency.targets                  | 2 +-
 src/tests/Common/test_dependencies/test_dependencies.csproj | 2 +-
 .../Common/test_dependencies_fs/test_dependencies.fsproj    | 2 +-
 src/tests/run.proj                                          | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tests/Common/ilasm/ilasm.ilproj b/src/tests/Common/ilasm/ilasm.ilproj
index 35c0b4ee0c5195..c73f6efe31f8e3 100644
--- a/src/tests/Common/ilasm/ilasm.ilproj
+++ b/src/tests/Common/ilasm/ilasm.ilproj
@@ -4,6 +4,6 @@
        needed by the IL SDK. -->
 
   <PropertyGroup>
-    <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/Common/publishdependency.targets b/src/tests/Common/publishdependency.targets
index 596e4573756df1..de7913a8c6afeb 100644
--- a/src/tests/Common/publishdependency.targets
+++ b/src/tests/Common/publishdependency.targets
@@ -28,7 +28,7 @@
   <Target Name="CopyDependencyToCoreRoot">
     <MSBuild Projects="@(CoreRootProjectFiles)"
              Targets="CopyDependencyToCoreRoot"
-             Properties="Language=C#;RuntimeIdentifier=$(PackageRID)" />
+             Properties="Language=C#;RuntimeIdentifier=$(OutputRid)" />
 
   </Target>
 </Project>
diff --git a/src/tests/Common/test_dependencies/test_dependencies.csproj b/src/tests/Common/test_dependencies/test_dependencies.csproj
index 22f94efd8f2f5f..d20bbec28869cd 100644
--- a/src/tests/Common/test_dependencies/test_dependencies.csproj
+++ b/src/tests/Common/test_dependencies/test_dependencies.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
     <DisableRarCache>true</DisableRarCache>
     <DisablePackageAssetsCache>true</DisablePackageAssetsCache>
-    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(PackageRID)</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(OutputRid)</RuntimeIdentifiers>
     <IncludeOOBLibraries>true</IncludeOOBLibraries>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj
index c23ba6368a498a..196db8eabec630 100644
--- a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj
+++ b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj
@@ -5,7 +5,7 @@
     <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
     <DisableRarCache>true</DisableRarCache>
     <DisablePackageAssetsCache>true</DisablePackageAssetsCache>
-    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(PackageRID)</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(OutputRid)</RuntimeIdentifiers>
     <IncludeOOBLibraries>true</IncludeOOBLibraries>
   </PropertyGroup>
 
diff --git a/src/tests/run.proj b/src/tests/run.proj
index 2d8d564ee15f0f..b7fe57ead80de5 100644
--- a/src/tests/run.proj
+++ b/src/tests/run.proj
@@ -589,8 +589,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
       <MonoLlvmPath>$(MonoBinDir)</MonoLlvmPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(CROSSCOMPILE)' != ''">
-      <AotCompiler>$(MonoBinDir)/cross/$(PackageRID)/mono-aot-cross</AotCompiler>
-      <MonoLlvmPath>$(MonoBinDir)/cross/$(PackageRID)</MonoLlvmPath>
+      <AotCompiler>$(MonoBinDir)/cross/$(OutputRid)/mono-aot-cross</AotCompiler>
+      <MonoLlvmPath>$(MonoBinDir)/cross/$(OutputRid)</MonoLlvmPath>
     </PropertyGroup>
 
     <ItemGroup>
@@ -826,7 +826,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
   <Target Name="CreateTestOverlay">
     <MSBuild Projects="$(MSBuildProjectFile)"
              Targets="CopyDependencyToCoreRoot"
-             Properties="Language=C#;PackageRID=$(PackageRID);RuntimeIdentifier=$(PackageRID)" />
+             Properties="Language=C#;OutputRid=$(OutputRid);RuntimeIdentifier=$(OutputRid)" />
   </Target>
 
   <Target Name="Build">