summaryrefslogtreecommitdiff
path: root/tests/src/JIT/Performance
diff options
context:
space:
mode:
Diffstat (limited to 'tests/src/JIT/Performance')
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj4
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj4
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj4
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj4
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj2
-rw-r--r--tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj4
-rw-r--r--tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj4
79 files changed, 85 insertions, 85 deletions
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 e032f83eb6..3c7189fd8c 100644
--- 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 e032f83eb6..3c7189fd8c 100644
--- 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 56d2c065b9..d07419abfd 100644
--- 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 147e656df5..44f989050d 100644
--- 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 8deda2377e..f4a61cbf00 100644
--- 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 94e4bedd0e..92d2f1598d 100644
--- 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 f796668987..705edf7253 100644
--- 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 e9942d9fe3..7f0ddba6aa 100644
--- 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 c84799234f..4f8023aaa2 100644
--- 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 7a1b3a2293..70219b81a9 100644
--- 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 da46bac201..1c7a5bad55 100644
--- 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 55a5ee7ef7..ec8a76918c 100644
--- 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 326811be49..ab74cddd1e 100644
--- 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 f96f2e8828..973de62c4a 100644
--- 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 756177fcad..bc98adfea9 100644
--- 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 f15f473009..7d34b69417 100644
--- 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 6aa7d71500..4eb95fca92 100644
--- 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 3f22766ae7..4a53567003 100644
--- 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 5572f5306a..70f0b780b2 100644
--- 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 6a3e86b670..c95c21d0b7 100644
--- 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 51f9ed6fb1..9c3d068b1a 100644
--- 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 3764deb8e0..e5133b0626 100644
--- 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 5ff78ab20f..7ead9607fc 100644
--- 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 da2734aad1..04663ebf34 100644
--- 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 e079509892..ee6053eae2 100644
--- 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 ffcbf4f392..c09e1832f3 100644
--- 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 3185a32f77..cae665f9bc 100644
--- 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 7e760463e1..c5f7084f0d 100644
--- 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 4bdade0316..c52c55c84b 100644
--- 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 9f3b92564f..89d5a133cb 100644
--- 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 ac0bf81709..8f71e3529d 100644
--- 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 7d5fef3b38..2e4244e317 100644
--- 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 f4857e1b52..a5abca12f6 100644
--- 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 0e6d00ab4d..f2d155daba 100644
--- 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 444c1d42b8..7f60df1bed 100644
--- 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 e37738887b..960827e7b6 100644
--- 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 ca3c5d8f33..da59f9680f 100644
--- 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 a53c99a45e..e112aa03b7 100644
--- 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 9066a8e748..025406bc6b 100644
--- 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 1f820177f4..9adbad6c91 100644
--- 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 cb4ed775cc..bdac396318 100644
--- 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 99832a2830..060275a56a 100644
--- 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 909301d915..42618f1f6e 100644
--- 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 db95575a6f..5d03a1b57e 100644
--- 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 b9fe3b19f5..af6452e776 100644
--- 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 776f7e1e8e..48d0d9a7a0 100644
--- 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 9881f0ed1f..64e0afe94f 100644
--- 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 7fc65a6e71..57a0e81410 100644
--- 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 1314ce19a7..0f58844c1c 100644
--- 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 dc1ccfda2b..75bcf78630 100644
--- 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 fd82229e5c..dfbd8121b7 100644
--- 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 1adf8d187d..64b1184bcb 100644
--- 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 b93f227838..7749ffcabe 100644
--- 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 a65219a7c8..24398da60b 100644
--- 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 c0b7a14f53..7eb5f032bf 100644
--- 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 c3abd5b278..4867ff7502 100644
--- 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 a38e960505..5cf881b9b7 100644
--- 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 c7a74f6f79..0a0c0d524a 100644
--- 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 cc7568559b..a0f3217b2d 100644
--- 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 c552f5a56a..3e30626bd1 100644
--- 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 8cfba2f93b..9dfa9e59c6 100644
--- 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 bb0c13d622..58f4661201 100644
--- 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 bb0aca7f14..ccae983ac2 100644
--- 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 c0abc7e688..827d2a9cba 100644
--- 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 7f06379d37..721f1c49f9 100644
--- 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 c69de091fd..cec064b6b9 100644
--- 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 760715aba0..690859eea8 100644
--- 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 7305eea9f9..989753dc06 100644
--- 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 6fac3b034a..90521c4cbb 100644
--- 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 bb5226e58c..0ae4d2061e 100644
--- 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 dec826a67d..9a88081060 100644
--- 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 ea19938bd5..305938f21e 100644
--- 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 65726fce85..0c80127f48 100644
--- 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 e28565bb52..8758b37acb 100644
--- 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 235de76463..38c4c16f61 100644
--- 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 c8d6b54a5e..42da96d10c 100644
--- 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 16649c889f..233f849104 100644
--- 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 ff54fab733..cd334382da 100644
--- 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 50c8420691..926984b5f8 100644
--- 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>