[Tizen] Set obj dir to be TargetRid specific

This allows to perform build for different arches in the same repository

diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 1a3e8d1..e062227 100644 (file)
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -18,16 +18,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\obj\project.assets.json"/>
-    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\obj\project.assets.json"/>
+    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\obj-$(TargetRid)\project.assets.json"/>
+    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\obj-$(TargetRid)\project.assets.json"/>
   </ItemGroup>
 
   <ItemGroup>
-    <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj\project.assets.json"/>
+    <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj-$(TargetRid)\project.assets.json"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj\project.assets.json"/>
+    <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj-$(TargetRid)\project.assets.json"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj
index fc61e1d..86df181 100644 (file)
--- a/tests/src/Common/CoreFX/CoreFX.depproj
+++ b/tests/src/Common/CoreFX/CoreFX.depproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-      <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
+      <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj-$(TargetRid)</RestoreOutputPath>
       <Language>C#</Language>
       <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker>
       <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -133,6 +133,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj
index 5319778..c4971b0 100644 (file)
--- a/tests/src/Common/external/external.depproj
+++ b/tests/src/Common/external/external.depproj
@@ -5,7 +5,7 @@
     <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
          This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
     -->
-    <RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath>
+    <RestoreOutputPath>$(MSBuildThisFileDirectory)obj-$(TargetRid)</RestoreOutputPath>
     <Language>C#</Language>
     <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
     <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort>
@@ -80,7 +80,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\external\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(SourceDir)Common\external\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
   <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences">

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj
index e032f83..3c7189f 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj
@@ -36,6 +36,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj
index e032f83..3c7189f 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj
@@ -36,6 +36,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj
index 56d2c06..d07419a 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj
index 147e656..44f9890 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj
index 8deda23..f4a61cb 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj
index 94e4bed..92d2f15 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj
index f796668..705edf7 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj
@@ -40,6 +40,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj
index e9942d9..7f0ddba 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj
@@ -40,6 +40,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj
index c847992..4f8023a 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj
index 7a1b3a2..70219b8 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj
@@ -34,6 +34,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj
index da46bac..1c7a5ba 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj
index 55a5ee7..ec8a769 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj
index 326811b..ab74cdd 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj
@@ -40,6 +40,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj
index f96f2e8..973de62 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj
@@ -40,6 +40,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj
index 756177f..bc98adf 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj
@@ -40,6 +40,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj
index f15f473..7d34b69 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj
@@ -40,6 +40,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj
index 6aa7d71..4eb95fc 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj
index 3f22766..4a53567 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj
index 5572f53..70f0b78 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj
index 6a3e86b..c95c21d 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj
index 51f9ed6..9c3d068 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj
index 3764deb..e5133b0 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj
index 5ff78ab..7ead960 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj
index da2734a..04663eb 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj
index e079509..ee6053e 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj
index ffcbf4f..c09e183 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj
index 3185a32..cae665f 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj
index 7e76046..c5f7084 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj
index 4bdade0..c52c55c 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj
index 9f3b925..89d5a13 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj
index ac0bf81..8f71e35 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj
index 7d5fef3..2e4244e 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj
index f4857e1..a5abca1 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj
index 0e6d00a..f2d155d 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj
index 444c1d4..7f60df1 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj
index e377388..960827e 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj
index ca3c5d8..da59f96 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj
index a53c99a..e112aa0 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj
index 9066a8e..025406b 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj
index 1f82017..9adbad6 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj
index cb4ed77..bdac396 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj
index 99832a2..060275a 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj
index 909301d..42618f1 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj
index db95575..5d03a1b 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj
index b9fe3b1..af6452e 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj
index 776f7e1..48d0d9a 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj
index 9881f0e..64e0afe 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj
index 7fc65a6..57a0e81 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj
index 1314ce1..0f58844 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj
index dc1ccfd..75bcf78 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj
index fd82229..dfbd812 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj
index 1adf8d1..64b1184 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj
index b93f227..7749ffc 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj
index a65219a..24398da 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj
index c0b7a14..7eb5f03 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj
index c3abd5b..4867ff7 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj
index a38e960..5cf881b 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj
index c7a74f6..0a0c0d5 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj
index cc75685..a0f3217 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj
index c552f5a..3e30626 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj
index 8cfba2f..9dfa9e5 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj
index bb0c13d..58f4661 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj
index bb0aca7..ccae983 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj
index c0abc7e..827d2a9 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj
@@ -51,6 +51,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj b/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj
index 7f06379..721f1c4 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj
@@ -35,6 +35,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj
index c69de09..cec064b 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj b/tests/src/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj
index 760715a..690859e 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj
@@ -53,6 +53,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+intrinsic\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+intrinsic\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj
index 7305eea..989753d 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj
@@ -35,6 +35,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj
index 6fac3b0..90521c4 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj
index bb5226e..0ae4d20 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj
@@ -34,6 +34,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+roslyn\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+roslyn\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj
index dec826a..9a88081 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj
@@ -42,6 +42,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj
index ea19938..305938f 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj
@@ -48,6 +48,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj
index 65726fc..0c80127 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj
@@ -43,6 +43,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj
index e28565b..8758b37 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj
index 235de76..38c4c16 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj
index c8d6b54..42da96d 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj
@@ -37,6 +37,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
index 16649c8..233f849 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
@@ -36,6 +36,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj
index ff54fab..cd33438 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj
index 50c8420..926984b 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj
@@ -33,6 +33,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/dir.props b/tests/src/dir.props
index 7b03cb8..89b43f8 100644 (file)
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -147,7 +147,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath>
+    <RestoreOutputPath>$(MSBuildProjectDirectory)\obj-$(TargetRid)</RestoreOutputPath>
 
     <!-- Specify the target framework of the common test dependency project.json. -->
     <NuGetTargetMoniker>.NETCoreApp,Version=v3.1</NuGetTargetMoniker>

diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 2dfd914..6e9a2e7 100644 (file)
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -229,7 +229,7 @@
   </Target>
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true' and '$(UsingMicrosoftNETSdk)' != 'true'">

diff --git a/tests/src/performance/linkbench/linkbench.csproj b/tests/src/performance/linkbench/linkbench.csproj
index 8ce3ab8..cdfec00 100644 (file)
--- a/tests/src/performance/linkbench/linkbench.csproj
+++ b/tests/src/performance/linkbench/linkbench.csproj
@@ -19,7 +19,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <PropertyGroup>
-    <RestoreOutputPath>..\obj</RestoreOutputPath>
+    <RestoreOutputPath>..\obj-$(TargetRid)</RestoreOutputPath>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -37,6 +37,6 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))\performance.targets" />
   <PropertyGroup>
-    <ProjectAssetsFile>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj
index f3a9ba5..3c25770 100644 (file)
--- a/tests/src/performance/perflab/PerfLab.csproj
+++ b/tests/src/performance/perflab/PerfLab.csproj
@@ -20,7 +20,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
   <PropertyGroup>
-    <RestoreOutputPath>..\obj</RestoreOutputPath>
+    <RestoreOutputPath>..\obj-$(TargetRid)</RestoreOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -44,6 +44,6 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))/performance.targets" />
   <PropertyGroup>
-    <ProjectAssetsFile>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))/obj/project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))/obj-$(TargetRid)/project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>

diff --git a/tests/src/sizeondisk/sodbench/SoDBench.csproj b/tests/src/sizeondisk/sodbench/SoDBench.csproj
index debbb16..a998d2e 100644 (file)
--- a/tests/src/sizeondisk/sodbench/SoDBench.csproj
+++ b/tests/src/sizeondisk/sodbench/SoDBench.csproj
@@ -19,7 +19,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <PropertyGroup>
-    <RestoreOutputPath>.\obj</RestoreOutputPath>
+    <RestoreOutputPath>.\obj-$(TargetRid)</RestoreOutputPath>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -37,6 +37,6 @@
   <Import Project="$(SourceDir)performance/performance.targets" />
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)performance/obj/project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(SourceDir)performance/obj-$(TargetRid)/project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>