From: Jacek Blaszczynski <biosciencenow@outlook.com>
Date: Fri, 3 Aug 2018 15:42:18 +0000 (+0200)
Subject: Fix performance tests and HW intrinsics test references
X-Git-Tag: submit/tizen/20210909.063632~11030^2~4191^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d8665c4514d45cb33a31dfa64232152c7a3b808;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

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 381ff0e85e2..696ab10ba43 100644
--- 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 7232046263e..9bde84623f7 100644
--- 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 2826c93ee48..fc14fa58830 100644
--- 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 7c7fdb1bf5f..9efcd151998 100644
--- 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 dc31f186a26..29b4904957e 100644
--- 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 310d6a8200e..03f49844140 100644
--- 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>