Fix performance tests and HW intrinsics test references

Commit migrated from https://github.com/dotnet/coreclr/commit/2d1a86806ef50b9b49cd95fc336a4fa73f6765ce

diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/dir.props b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/dir.props
index 381ff0e85e24f23481c60cf891269de9b7978a8f..696ab10ba43e79677261e202fb7591cf040556a4 100644 (file)
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/dir.props
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/dir.props
@@ -2,6 +2,6 @@
   <Import Condition="Exists('..\dir.props')" Project="..\dir.props"/>
 
   <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
index 7232046263ea1ed402f0b692568e1b0159798684..9bde84623f76789454e539b63c9139331fc64254 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
+++ b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
@@ -32,7 +32,4 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-  <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
-  </PropertyGroup>
 </Project>

diff --git a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj
index 2826c93ee48cdc47bad9b33cd0129a2cc6b29c20..fc14fa58830f1e5bcf47280251025899f1ef3aaa 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj
+++ b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj
@@ -33,7 +33,4 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-  <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
-  </PropertyGroup>
 </Project>

diff --git a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
index 7c7fdb1bf5f6bfc2d2562c47c491a86ad46486b1..9efcd151998b2475d69b118d65fc6bfb463de519 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
+++ b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
@@ -9,8 +9,8 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
-    <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/coreclr/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/src/coreclr/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
index dc31f186a260ba1a8d6b11dd5186c772ec1c08f1..29b4904957e0d8a5ba9c5976349124619f8e8570 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
+++ b/src/coreclr/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
@@ -32,7 +32,4 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-  <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
-  </PropertyGroup>
 </Project>

diff --git a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
index 310d6a8200ee3165bb448192ffa20cb3c83f9503..03f49844140144d9a912bdb5a416537683e90a7d 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
+++ b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
@@ -30,7 +30,4 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-  <PropertyGroup>
-    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
-  </PropertyGroup>
 </Project>