From 2d1a86806ef50b9b49cd95fc336a4fa73f6765ce Mon Sep 17 00:00:00 2001
From: Jacek Blaszczynski <biosciencenow@outlook.com>
Date: Fri, 3 Aug 2018 17:42:18 +0200
Subject: [PATCH] Fix performance tests and HW intrinsics test references

---
 tests/src/JIT/HardwareIntrinsics/X86/dir.props                | 2 +-
 .../Performance/CodeQuality/Inlining/InlineGCStruct.csproj    | 3 ---
 .../src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj | 3 ---
 .../Performance/CodeQuality/Math/Functions/Functions.csproj   | 4 ++--
 .../Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj | 3 ---
 tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj  | 3 ---
 6 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/tests/src/JIT/HardwareIntrinsics/X86/dir.props b/tests/src/JIT/HardwareIntrinsics/X86/dir.props
index 381ff0e85e24..696ab10ba43e 100644
--- a/tests/src/JIT/HardwareIntrinsics/X86/dir.props
+++ b/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/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
index 7232046263ea..9bde84623f76 100644
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
+++ b/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/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj b/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj
index 2826c93ee48c..fc14fa58830f 100644
--- a/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj
+++ b/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/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
index 7c7fdb1bf5f6..9efcd151998b 100644
--- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
+++ b/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/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
index dc31f186a260..29b4904957e0 100644
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
+++ b/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/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
index 310d6a8200ee..03f498441401 100644
--- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
+++ b/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>