diff options
108 files changed, 903 insertions, 20 deletions
diff --git a/dependencies.props b/dependencies.props index 04bf568bcf..3b34fedef1 100644 --- a/dependencies.props +++ b/dependencies.props @@ -36,9 +36,9 @@ <PgoDataPackageVersion>99.99.99-master-20180226-0052</PgoDataPackageVersion> <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview2-26222-07</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion> - - <XunitPerformanceApiPackageVersion>1.0.0-beta-build0018</XunitPerformanceApiPackageVersion> - <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.5</MicrosoftDiagnosticsTracingTraceEventPackageVersion> + <XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion> + <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion> + <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.4</MicrosoftDiagnosticsTracingTraceEventPackageVersion> <CommandLineParserVersion>2.1.1</CommandLineParserVersion> <VCRuntimeVersion>1.2.0</VCRuntimeVersion> diff --git a/tests/build.proj b/tests/build.proj index 699a013029..43c4997763 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -21,11 +21,15 @@ </PropertyGroup> <ItemGroup> + <RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\vc_runtime\vc_runtime.csproj" Condition="'$(__BuildArch)' == 'arm'"/> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\performance\performance.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\TestWrappersConfig\TestWrappersConfig.csproj" /> </ItemGroup> diff --git a/tests/scripts/scripts.csproj b/tests/scripts/scripts.csproj new file mode 100644 index 0000000000..b1a1aab6e5 --- /dev/null +++ b/tests/scripts/scripts.csproj @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <ItemGroup> + <PackageReference Include="Microsoft.DotNet.xunit.performance.run.core"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance.analysis.cli"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance.runner.cli"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>1.0.0-prerelease-00629-04</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.3</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <Import Project="$(MSBuildThisFileDirectory)..\src\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj index 1ada622337..46d753cdf0 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -45,8 +45,8 @@ <PackageReference Include="xunit"> <Version>$(XunitPackageVersion)</Version> </PackageReference> - <PackageReference Include="xunit.runner.console"> - <Version>$(XunitPackageVersion)</Version> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XunitConsoleNetcorePackageVersion)</Version> </PackageReference> <PackageReference Include="xunit.runner.utility"> <Version>$(XunitPackageVersion)</Version> diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj index 0af92356a5..02d073a3fb 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.csproj +++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj @@ -31,4 +31,7 @@ </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/Directed/Misc/function_pointer/MutualThdRecur-fptr.il b/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il index 785936995e..36d1c1a6e2 100644 --- a/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il +++ b/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il @@ -7,13 +7,6 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } - -.assembly extern System.Threading.Thread -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) - .ver 4:0:0:0 -} - .assembly extern legacy library mscorlib {} .assembly mutualthdrecurfptr { diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj index 3b233ba76b..0ae44d99ef 100644 --- a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj +++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj @@ -34,4 +34,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj index db5ec5fd8f..1c73b49779 100644 --- a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj +++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj @@ -33,4 +33,7 @@ </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>
\ No newline at end of file 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 a7cc0aa57d..e032f83eb6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,4 +35,7 @@ </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/BenchmarksGame/binarytrees/binarytrees-5.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj index a7cc0aa57d..e032f83eb6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,4 +35,7 @@ </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/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj index 8e983c1c1b..56d2c065b9 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 05d235cc15..147e656df5 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 d1bafbd1e8..8deda2377e 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 f4b96e99c1..94e4bedd0e 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 4899b1e106..d65aaae57d 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,4 +43,7 @@ </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/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj index 18e5a67dc8..9e72ba4a0f 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,4 +43,7 @@ </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/BenchmarksGame/mandelbrot/mandelbrot-2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj index e1a915776d..c84799234f 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 919961afd5..7a1b3a2293 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -31,4 +33,7 @@ </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/BenchmarksGame/n-body/n-body-3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj index 1ffcb3a56c..da46bac201 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 a2beaad8d0..55a5ee7ef7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 dae5c475e6..a2acf1f1fe 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,4 +43,7 @@ </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/BenchmarksGame/regex-redux/regex-redux-5.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj index eda28bc840..cd45a0937c 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,4 +43,7 @@ </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/BenchmarksGame/reverse-complement/reverse-complement-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj index e7f886830d..5e0c567553 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,4 +43,7 @@ </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/BenchmarksGame/reverse-complement/reverse-complement-6.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj index 62e0e16be7..b1be51cf12 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 @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,4 +43,7 @@ </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/BenchmarksGame/spectralnorm/spectralnorm-1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj index c6f8cdc145..6aa7d71500 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 b98a5a674e..3f22766ae7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 4452be348f..5572f5306a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj index 0fc7cb93f8..6a3e86b670 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj index 3d8b6dcda8..51f9ed6fb1 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj index fba60ac986..3764deb8e0 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj index 0b7f607eb6..5ff78ab20f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj index 3dfd3aeafa..da2734aad1 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj index 68b03430f1..e079509892 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj index 074d13857f..ffcbf4f392 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj index f191d09e27..3185a32f77 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj index 315e9a3489..7e760463e1 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj index 4cab55f363..4bdade0316 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj index bc7fd522ef..9f3b92564f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj index 941548d2d9..ac0bf81709 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj index b0e031e844..7d5fef3b38 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj index ec958dfcb7..f4857e1b52 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj index a768df4c29..0e6d00ab4d 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj index e99c284f07..444c1d42b8 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj index 2edbda5ba3..e37738887b 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj index 2604bd2c24..ca3c5d8f33 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj index a83ec3657d..a53c99a45e 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj index d896d9d096..9066a8e748 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj index b429e36eeb..1f820177f4 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj index 7ebfb2a7c7..cb4ed775cc 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj index d11487367e..99832a2830 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj index 8418f2aa7a..909301d915 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj index 18daaefd37..db95575a6f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj index ba45627c3a..b9fe3b19f5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj index 986ee4c50d..776f7e1e8e 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj index 0a39f9745d..9881f0ed1f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj index 94f5fbfcbc..7fc65a6e71 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj index e7b4ccbd1f..1314ce19a7 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj index 6116d98c21..dc1ccfda2b 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj index b4166f4b46..fd82229e5c 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj index f956689b07..1adf8d187d 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj index 5ebca95471..b93f227838 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj index 5e65e71d4a..a65219a7c8 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj index c664a1156d..c0b7a14f53 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj index b90d6c4c20..c3abd5b278 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj index d870845ea9..a38e960505 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj index eefa6a019f..c7a74f6f79 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj index 8d9e8e875b..cc7568559b 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj index 2a5c9e62e0..c552f5a56a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj index 7f3761da30..8cfba2f93b 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Benchstones/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj index 93c907b06c..bb0c13d622 100644 --- a/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Burgers/Burgers.csproj b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj index 2ec08b2597..bb0aca7f14 100644 --- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ 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 069859ea43..a293c23987 100644 --- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -46,4 +48,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj b/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj index f91da7924f..7f06379d37 100644 --- a/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -32,4 +34,7 @@ </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/FractalPerf/FractalPerf.csproj b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj index 287fa1507c..c69de091fd 100644 --- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj +++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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/Inlining/InlineGCStruct.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj index 9bde84623f..7232046263 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj @@ -32,4 +32,7 @@ </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/Inlining/NoThrowInline.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj index 11674c4bce..7305eea9f9 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -32,4 +34,7 @@ </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 fc14fa5883..2826c93ee4 100644 --- a/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj @@ -33,4 +33,7 @@ </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/Linq/Linq.csproj b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj index 2e91303669..6fac3b034a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj index 2aaf18070c..7c7fdb1bf5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj @@ -9,6 +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> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index 4f37f24216..bb5226e58c 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -31,4 +33,7 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+roslyn\obj\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 41fb6c24e1..dec826a67d 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -39,4 +41,7 @@ </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/SIMD/RayTracer/RayTracer.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj index 79a9db0ee6..ea19938bd5 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -45,4 +47,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj index 29b4904957..dc31f186a2 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj @@ -32,4 +32,7 @@ </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/SciMark/SciMark.csproj b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj index 11839dedb3..65726fce85 100644 --- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <AssemblyName>SciMark</AssemblyName> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -40,4 +42,7 @@ </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>
\ 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 cf3f16437e..e28565bb52 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj index d642f16c9a..235de76463 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj index d91c6b68b3..ad67828b47 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -11,6 +11,8 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -35,4 +37,7 @@ </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/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj index c418de0872..27581abd31 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!-- Always try to use latest Roslyn compiler --> + <Import Project="$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="Exists('$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props')" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -9,6 +11,8 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -32,4 +36,7 @@ </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/V8/Crypto/Crypto.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj index a3c09814c7..ff54fab733 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj index 6404f4d723..50c8420691 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj @@ -9,6 +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>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -30,4 +32,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj index 03f4984414..310d6a8200 100644 --- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj +++ b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj @@ -30,4 +30,7 @@ </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/Regression/JitBlue/DevDiv_461649/DevDiv_461649.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_461649/DevDiv_461649.csproj index 1b3c70aee6..5cfcb815db 100644 --- a/tests/src/JIT/Regression/JitBlue/DevDiv_461649/DevDiv_461649.csproj +++ b/tests/src/JIT/Regression/JitBlue/DevDiv_461649/DevDiv_461649.csproj @@ -27,6 +27,7 @@ </PropertyGroup> <ItemGroup> <Compile Include="$(MSBuildProjectName).cs" /> + <Reference Include="System.Private.Xml" /> <Content Include="Input.xml"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj index 3657597737..1b7f8a70b5 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj @@ -10,6 +10,7 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -34,4 +35,7 @@ </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/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj index 3657597737..1b7f8a70b5 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj @@ -10,6 +10,7 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -34,4 +35,7 @@ </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/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj index 7036ce909b..7fd889b430 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj @@ -32,4 +32,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj index 3657597737..1b7f8a70b5 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj @@ -10,6 +10,7 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -34,4 +35,7 @@ </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/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj index 6027078312..6e6b28ab92 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj @@ -31,4 +31,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj new file mode 100644 index 0000000000..563a9a7087 --- /dev/null +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Dynamic.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Thread"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Security.Cryptography.Algorithms"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XunitConsoleNetcorePackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj new file mode 100644 index 0000000000..d554c165f6 --- /dev/null +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>7.0.1</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.ObjectModel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Dynamic.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Json"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Primitives"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Xml"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlSerializer"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XunitConsoleNetcorePackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project> diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj new file mode 100644 index 0000000000..4d49fdee3e --- /dev/null +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XunitPerformanceApiPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Collections.NonGeneric"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Expressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Memory"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Thread"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.ThreadPool"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.Process"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XunitConsoleNetcorePackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/jit64/mcc/common/common.il b/tests/src/JIT/jit64/mcc/common/common.il index 82e2722905..8dfc8aa5a6 100644 --- a/tests/src/JIT/jit64/mcc/common/common.il +++ b/tests/src/JIT/jit64/mcc/common/common.il @@ -2,9 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -.assembly extern mscorlib {} -.assembly extern system.runtime.extensions {} - +// Metadata version: v2.0.50727 +.assembly extern mscorlib +{ + .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4.. + .ver 2:0:0:0 +} .module common.netmodule // MVID: {8A774AEE-5C13-4F6C-8345-881D79617488} .imagebase 0x00400000 diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj index 3d292a7ed7..6ca2f93f30 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj @@ -33,4 +33,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/JIT/opt/Devirtualization/override.ilproj b/tests/src/JIT/opt/Devirtualization/override.ilproj index 65682b38c7..289470879d 100644 --- a/tests/src/JIT/opt/Devirtualization/override.ilproj +++ b/tests/src/JIT/opt/Devirtualization/override.ilproj @@ -33,4 +33,7 @@ </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>
\ No newline at end of file diff --git a/tests/src/performance/Scenario/JitBench/JitBench.csproj b/tests/src/performance/Scenario/JitBench/JitBench.csproj index ea1b2e51d6..2e384d183e 100644 --- a/tests/src/performance/Scenario/JitBench/JitBench.csproj +++ b/tests/src/performance/Scenario/JitBench/JitBench.csproj @@ -12,6 +12,8 @@ <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.6</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -36,6 +38,10 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="..\..\performance.targets" /> + <PropertyGroup> + <ProjectAssetsFile>..\..\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + <ItemGroup> <!-- BaselineMicrosoftNetCoreAppPackageVersion comes from dependencies.props in the root of the coreclr tree --> <VersioningConstantsLines Include="namespace JitBench { public static class VersioningConstants { public static string MicrosoftNetCoreAppPackageVersion="$(BaselineMicrosoftNetCoreAppPackageVersion)"%3B } }" /> diff --git a/tests/src/performance/linkbench/linkbench.csproj b/tests/src/performance/linkbench/linkbench.csproj index dbba797dd0..8ce3ab83e8 100644 --- a/tests/src/performance/linkbench/linkbench.csproj +++ b/tests/src/performance/linkbench/linkbench.csproj @@ -12,6 +12,8 @@ <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.6</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -34,4 +36,7 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))\performance.targets" /> + <PropertyGroup> + <ProjectAssetsFile>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), performance.targets))\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj index f7c7863fc5..f295d94a49 100644 --- a/tests/src/performance/perflab/PerfLab.csproj +++ b/tests/src/performance/perflab/PerfLab.csproj @@ -11,6 +11,8 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <DefineConstants>$(DefineConstants);STATIC</DefineConstants> + <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj index 8a190a0073..94caf35ac2 100644 --- a/tests/src/performance/performance.csproj +++ b/tests/src/performance/performance.csproj @@ -2,8 +2,8 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <NugetTargetMoniker>.NETStandard,Version=v2.0</NugetTargetMoniker> - <NugetTargetMonikerShort>netstandard2.0</NugetTargetMonikerShort> + <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.6</NugetTargetMonikerShort> <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> @@ -25,19 +25,89 @@ <PackageReference Include="Microsoft.NETCore.Platforms"> <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> </PackageReference> + <PackageReference Include="System.Collections.NonGeneric"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Expressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Loader"> + <Version>4.0.0</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Thread"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.Process"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XPath"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XPath.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> <PackageReference Include="xunit"> <Version>$(XunitPackageVersion)</Version> </PackageReference> - <PackageReference Include="xunit.runner.console"> - <Version>$(XunitPackageVersion)</Version> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XunitConsoleNetcorePackageVersion)</Version> </PackageReference> <PackageReference Include="xunit.runner.utility"> <Version>$(XunitPackageVersion)</Version> </PackageReference> + <PackageReference Include="System.Security.Principal.Windows"> + <Version>4.4.0</Version> + </PackageReference> </ItemGroup> <PropertyGroup> - <TargetFramework>netstandard2.0</TargetFramework> + <TargetFramework>netstandard1.6</TargetFramework> <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> diff --git a/tests/src/sizeondisk/sodbench/SoDBench.csproj b/tests/src/sizeondisk/sodbench/SoDBench.csproj index c26343258f..e61c660307 100644 --- a/tests/src/sizeondisk/sodbench/SoDBench.csproj +++ b/tests/src/sizeondisk/sodbench/SoDBench.csproj @@ -12,6 +12,8 @@ <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.5</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -33,4 +35,8 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="..\..\performance\performance.targets" /> + + <PropertyGroup> + <ProjectAssetsFile>..\..\performance\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project> |