Use OutputRid in test projects (#58340)
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Tue, 31 Aug 2021 14:50:01 +0000 (07:50 -0700)
committerGitHub <noreply@github.com>
Tue, 31 Aug 2021 14:50:01 +0000 (07:50 -0700)
Co-authored-by: Adeel <3840695+am11@users.noreply.github.com>
src/tests/Common/ilasm/ilasm.ilproj
src/tests/Common/publishdependency.targets
src/tests/Common/test_dependencies/test_dependencies.csproj
src/tests/Common/test_dependencies_fs/test_dependencies.fsproj
src/tests/run.proj

index 35c0b4ee0c51951a2d4f2068cb87bee9d989f492..c73f6efe31f8e3f153f88d1fcc1ebfaa3f4e7e7d 100644 (file)
@@ -4,6 +4,6 @@
        needed by the IL SDK. -->
 
   <PropertyGroup>
-    <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
   </PropertyGroup>
 </Project>
index 596e4573756df1a2f9ad608e8c3fcbf9d01f5b8d..de7913a8c6afebe23f1fc5b8b326b55b397225eb 100644 (file)
@@ -28,7 +28,7 @@
   <Target Name="CopyDependencyToCoreRoot">
     <MSBuild Projects="@(CoreRootProjectFiles)"
              Targets="CopyDependencyToCoreRoot"
-             Properties="Language=C#;RuntimeIdentifier=$(PackageRID)" />
+             Properties="Language=C#;RuntimeIdentifier=$(OutputRid)" />
 
   </Target>
 </Project>
index 22f94efd8f2f5fac72ee4ffbeca9a04e736f1c58..d20bbec28869cded3c49535c6308ab9e51f9cc62 100644 (file)
@@ -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>
index c23ba6368a498a31123c8df5d817d8841a85b349..196db8eabec6307129576d67d7d4f33ee8d52278 100644 (file)
@@ -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>
 
index 2d8d564ee15f0f5746771ae4cb7c74963965bf23..b7fe57ead80de540fe2a4aaa42364fc7881a86c8 100644 (file)
@@ -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">