diff options
Diffstat (limited to 'tests/src')
168 files changed, 1162 insertions, 934 deletions
diff --git a/tests/src/Common/PerfHarness/PerfHarness.cs b/tests/src/Common/PerfHarness/PerfHarness.cs index b3a0ea48c5..f78022517b 100644 --- a/tests/src/Common/PerfHarness/PerfHarness.cs +++ b/tests/src/Common/PerfHarness/PerfHarness.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using System.Reflection; using System.Collections.Generic; using Microsoft.Xunit.Performance.Api; diff --git a/tests/src/Common/PerfHarness/PerfHarness.csproj b/tests/src/Common/PerfHarness/PerfHarness.csproj new file mode 100644 index 0000000000..5f9377c225 --- /dev/null +++ b/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp1.1</TargetFramework> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.App"> + <Version>1.1.0</Version> + </PackageReference> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/tests/src/Common/PerfHarness/project.json b/tests/src/Common/PerfHarness/project.json deleted file mode 100644 index bed9544b65..0000000000 --- a/tests/src/Common/PerfHarness/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - }, - "xunit.performance.api": "1.0.0-beta-build0004" - } - } - } -} diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj index 63c54488f2..3718f79578 100644 --- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj @@ -7,8 +7,30 @@ <CLRTestKind>BuildOnly</CLRTestKind> </PropertyGroup> <ItemGroup> - <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> + <PackageReference Include="Microsoft.NETCore.ILAsm"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.ILDAsm"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Jit"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.TestHost"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;win10-arm64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json deleted file mode 100644 index 56ee674728..0000000000 --- a/tests/src/Common/build_against_pkg_dependencies/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.ILAsm": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.ILDAsm": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.Jit": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.TestHost": "2.0.0-preview2-25316-03" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "win10-arm64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "opensuse.42.1-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json deleted file mode 100644 index e1ec3bfd42..0000000000 --- a/tests/src/Common/empty/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/external/external.csproj b/tests/src/Common/external/external.csproj deleted file mode 100644 index f7fa75ed32..0000000000 --- a/tests/src/Common/external/external.csproj +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <CLRTestKind>BuildOnly</CLRTestKind> - <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> - </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/Common/external/external.depproj b/tests/src/Common/external/external.depproj index 5a16122cdb..710866f629 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -5,19 +5,54 @@ <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> - <ProjectJson>$(MSBuildThisFileDirectory)project.json</ProjectJson> - <ProjectLockJson>$(MSBuildThisFileDirectory)project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath> <Language>C#</Language> <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort> <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier> + <ContainsPackageReferences>true</ContainsPackageReferences> <OutputPath>$(TargetingPackPath)</OutputPath> <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId> <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId> <CLRTestKind>SharedLibrary</CLRTestKind> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>9.0.1</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <PackageToInclude Include="xunit.abstractions"/> <PackageToInclude Include="xunit.assert"/> @@ -40,6 +75,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\external\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences" Condition="'$(TargetGroup)' == 'netfx'"> <Error Condition="!Exists('$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe')" Text="Error: looks the package $(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion) not restored or missing xunit.console.exe." diff --git a/tests/src/Common/external/project.json b/tests/src/Common/external/project.json deleted file mode 100644 index b5e378db94..0000000000 --- a/tests/src/Common/external/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Newtonsoft.Json": "9.0.1", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {} - } -} diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json deleted file mode 100644 index 9d8811f7c5..0000000000 --- a/tests/src/Common/netcoreapp/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": "2.0.0-beta-001494-00", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25316-01" - }, - "frameworks": { - "netcoreapp2.0": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json deleted file mode 100644 index 566b4c66b9..0000000000 --- a/tests/src/Common/targeting_pack_ref/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview2-25316-03" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj index 65e37c03c3..f59dfa3905 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -6,6 +6,19 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json deleted file mode 100644 index 9d1a65842e..0000000000 --- a/tests/src/Common/test_dependencies/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25316-01", - "System.Memory": "4.4.0-preview2-25316-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25316-01", - "System.Security.Permissions": "4.4.0-preview2-25316-01" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "netcoreapp1.1", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index 0b0f5b82bf..65f01bf3a2 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -6,8 +6,34 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.CoreDisTools"> + <Version>1.0.1-prerelease-*</Version> + </PackageReference> + <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Memory"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Security.Permissions"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" - DependsOnTargets="ResolveReferences" /> -</Project> + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json deleted file mode 100644 index 6c5cd04ef7..0000000000 --- a/tests/src/Common/test_runtime/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease", - "jit-dasm": "0.0.1.4", - "cijobs": "0.0.1.2", - "jit-analyze": "0.0.1.1" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 3b55297f3d..7b01268dec 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -5,14 +5,34 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> - <!-- Reset the Default project.json--> - <ProjectJson></ProjectJson> - <ProjectLockJson></ProjectLockJson> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.CoreCLR.TestDependencies"> + <Version>1.0.0-prerelease</Version> + </PackageReference> + <PackageReference Include="jit-dasm"> + <Version>0.0.1.4</Version> + </PackageReference> + <PackageReference Include="cijobs"> + <Version>0.0.1.2</Version> + </PackageReference> + <PackageReference Include="jit-analyze"> + <Version>0.0.1.1</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj index 61fe6102ea..02d073a3fb 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.csproj +++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj @@ -29,10 +29,9 @@ <ItemGroup> <Compile Include="CheckProjects.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/TypedReference/TypedReference.csproj b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj index 36cd9b760b..13a728059d 100644 --- a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj +++ b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="TypedReference.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj index 953edac964..dcef420e0a 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj index 829c62c4c4..84ef3caf97 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj index 3c5f1cc245..22e4d5e32d 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj index a41f31a39d..1b0800a1af 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj index d8ec34de75..0ae44d99ef 100644 --- a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj +++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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/VT/etc/_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj index afe15bbe2d..2edd488ce0 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj index 33039679f7..3579d2647e 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj index 7ec8612274..2638322546 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj index b0b398de80..0298dde5d2 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj index 2b1acc4a5c..d3849b1a14 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj index 97be5fecbd..4a165d377d 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj index 592c20a7b8..694363a0ce 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj index 817c22f9c3..ca5a53abba 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj index f858d0f6bd..9601e61e1e 100644 --- a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj index 11babc3182..c2ba77845c 100644 --- a/tests/src/JIT/Methodical/VT/etc/nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj index 3d7729f5e7..cfbf44f7b0 100644 --- a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj +++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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/refany/_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj index c8dd1da34c..0e77a28947 100644 --- a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_dbgnative.csproj index 1ffea88844..e8edef3a7c 100644 --- a/tests/src/JIT/Methodical/refany/_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj index eb5c6626f3..9704560fab 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj index c41462c110..540ee3c8dc 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj index f1b1b10a24..50a1e714c2 100644 --- a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_relgcreport.csproj index 8781f33cdb..da3914fcdb 100644 --- a/tests/src/JIT/Methodical/refany/_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_relgcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relnative.csproj b/tests/src/JIT/Methodical/refany/_relnative.csproj index 50bccd2c9d..88e840991c 100644 --- a/tests/src/JIT/Methodical/refany/_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_relnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relstress1.csproj b/tests/src/JIT/Methodical/refany/_relstress1.csproj index 08cfb0238f..19a9a55226 100644 --- a/tests/src/JIT/Methodical/refany/_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relstress3.csproj b/tests/src/JIT/Methodical/refany/_relstress3.csproj index 03c37ce533..65da5b03e3 100644 --- a/tests/src/JIT/Methodical/refany/_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj index 459da7d647..d1e9e6767c 100644 --- a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj index 21e1dfb876..2e39368075 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj index f7fde093de..8757d50b1a 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj index 10d26819f4..10a8cd5f6a 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj index cfd702ecae..124554ed79 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj index 531b47a9bc..45aad43acc 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj index 3fb0a8d27f..a0bc8fff61 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj index 11e2afd4be..30045fba82 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj index f300ebc4aa..0e484466b1 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj index fd6a9aedb9..6e160e6e01 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj index ecae4158e9..ab78d753e8 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/array1.csproj b/tests/src/JIT/Methodical/refany/array1.csproj index 83c8927f2d..8c713ad864 100644 --- a/tests/src/JIT/Methodical/refany/array1.csproj +++ b/tests/src/JIT/Methodical/refany/array1.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="array1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/array2.csproj b/tests/src/JIT/Methodical/refany/array2.csproj index 1890a9c9d0..1d57843df2 100644 --- a/tests/src/JIT/Methodical/refany/array2.csproj +++ b/tests/src/JIT/Methodical/refany/array2.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="array2.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/format.csproj b/tests/src/JIT/Methodical/refany/format.csproj index 18b8fa8e87..008ec5fad3 100644 --- a/tests/src/JIT/Methodical/refany/format.csproj +++ b/tests/src/JIT/Methodical/refany/format.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="format.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/gcreport.csproj b/tests/src/JIT/Methodical/refany/gcreport.csproj index 04d0fffb01..c40ea0504b 100644 --- a/tests/src/JIT/Methodical/refany/gcreport.csproj +++ b/tests/src/JIT/Methodical/refany/gcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/lcs.csproj b/tests/src/JIT/Methodical/refany/lcs.csproj index 122a161b4a..187948b805 100644 --- a/tests/src/JIT/Methodical/refany/lcs.csproj +++ b/tests/src/JIT/Methodical/refany/lcs.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="lcs.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/native.csproj b/tests/src/JIT/Methodical/refany/native.csproj index db30722d05..a100b56c0d 100644 --- a/tests/src/JIT/Methodical/refany/native.csproj +++ b/tests/src/JIT/Methodical/refany/native.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/virtcall.csproj b/tests/src/JIT/Methodical/refany/virtcall.csproj index fecf6cc43e..1f7727308c 100644 --- a/tests/src/JIT/Methodical/refany/virtcall.csproj +++ b/tests/src/JIT/Methodical/refany/virtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj index 0225a059b7..b15027176f 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj index faf18d60df..10128517d2 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj index 82d5593bcd..7ff0df3280 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj index f7e7aafbeb..7089fece10 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj index 8f35c4bb65..fa8199743a 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj index 80afc6699a..9d5cf5d0e6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Adams.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj index 174ee76e18..c42c73625c 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchMk2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj index 1594ae0a45..e26289d3f4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchMrk.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj index 70fdb06897..345ee32477 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Bisect.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj index bd1b084df5..9eb733599a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="DMath.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj index 10f39efd08..28b1fa42a7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="FFT.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj index 975bf96f92..0d3d9d324a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="InProd.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj index 417f1c5631..8971e8aa78 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="InvMt.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj index 6751cc2492..2b4d20a5c3 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="LLoops.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj index 1ab94d40c8..0a309d0b35 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Lorenz.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj index 09454d9218..2c43dba6cd 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="MatInv4.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj index 1213cae10a..a0978c2c6a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NewtE.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj index a6f11c0f06..3fffb1b1b8 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NewtR.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj index 37fa54eda8..b674da9031 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Regula.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj index ca2c525458..147ae342a4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Romber.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj index 27e3773834..9bc41d95aa 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Secant.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj index d7b09af860..b63153a388 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Simpsn.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj index 90d780e258..daf711df07 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="SqMtx.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj index e9f704cf6b..97909f61d0 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Trap.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj index 02eaf525e9..c08f3ff969 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Whetsto.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj index a4c3de5674..5db8e820ac 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="8Queens.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj index 8f72e1c87e..08dfa01a1a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Ackermann.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj index ffadd54595..9c260fe837 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="AddArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj index 2619b38c0c..265b099233 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="AddArray2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj index cb1ed7b648..3bbd8afc30 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Array1.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj index b368d85bda..9a3f889660 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Array2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj index 6d58dc402f..05e511d32b 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchE.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj index 776afa72c0..674e4f687a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BubbleSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj index 448892e8eb..d5870cd244 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BubbleSort2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj index edbab6006b..85a1aea481 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="CSieve.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj index ff30f8ccf7..91763f28fa 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Fib.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj index 270e55060f..7aed611204 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="HeapSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj index bcf7b40d72..15e50078ac 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="IniArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj index 669a0efdd5..3ab835d461 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="LogicArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj index 666ba47ce2..76d2a5a391 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Midpoint.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj index 78573f88cc..4c73bd6564 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="MulMatrix.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj index 5622ad71d2..b8eb815e06 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NDhrystone.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj index 63339c8903..76d7b9ded5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Permutate.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj index 5228f957ba..c2368e0d35 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Pi.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj index ea10a44d83..66d9b49550 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Puzzle.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj index f16d1d38b1..87408cd0b4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="QuickSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj index caa2de7720..a768a01d95 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="TreeInsert.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj index 9d253e28b4..770b495ac5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="TreeSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj index a234c09352..a18aa8811a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="XposMatrix.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj index 3cbf952833..d10772f2af 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj @@ -10,6 +10,7 @@ <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 --> @@ -32,11 +33,9 @@ <ItemGroup> <Compile Include="binarytrees.csharp.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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/binarytrees3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj index a7c8f2daf3..3dffd5e4bf 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj @@ -10,6 +10,7 @@ <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 --> @@ -32,11 +33,9 @@ <ItemGroup> <Compile Include="binarytrees.csharp3.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj index 259d5e8ff3..5d5c7f72c6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="fasta.csharp-2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/fastaredux/fastaredux.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj index 8d77905de9..30c542ee27 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="fastaredux.csharp.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj index 097a3a2534..89c8ad5c47 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj @@ -10,6 +10,7 @@ <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' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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/nbody/nbody.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj index f8c3785f54..be7e66e2a3 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="nbody.csharp-3.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/pi-digits.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj index 7396e3b00f..003871e447 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="pi-digits.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/regexdna/regexdna.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj index 6f334e9afb..e7b9d42bd0 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj @@ -10,6 +10,7 @@ <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' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj index 69d39df429..00789ed3a5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj @@ -10,6 +10,7 @@ <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' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj index e12feab89a..3cbd6d32db 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="spectralnorm.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/Burgers/Burgers.csproj b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj index 0f57308962..bb0aca7f14 100644 --- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Burgers.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 26a64c6e89..a293c23987 100644 --- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -10,6 +10,7 @@ <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 --> @@ -45,10 +46,9 @@ <Compile Include="numericsort.cs" /> <Compile Include="utility.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/FractalPerf/FractalPerf.csproj b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj index af7ce3b4c9..7bac1f4bdf 100644 --- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj +++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="FractalPerf.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/Inlining/InlineGCStruct.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj index 7ecdbab687..7d26fcb734 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj @@ -30,11 +30,9 @@ <ItemGroup> <Compile Include="InlineGCStruct.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 34b42c389f..965618d15d 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj @@ -10,6 +10,7 @@ <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' "> @@ -31,11 +32,9 @@ <ItemGroup> <Compile Include="NoThrowInline.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 2fc6cb0419..6fac3b034a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Linq.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 2545a585bb..067ea9f7e0 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj @@ -10,6 +10,7 @@ <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' "> @@ -73,4 +74,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index baea313f2c..bb5226e58c 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -10,6 +10,7 @@ <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 --> @@ -30,10 +31,9 @@ <ItemGroup> <Compile Include="CscBench.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 b6224770fa..dc256858fa 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj @@ -10,6 +10,7 @@ <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> @@ -38,10 +39,9 @@ <Compile Include="VectorFloatStrict.cs" /> <Compile Include="VectorHelpers.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/RayTracer/RayTracer.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj index 0b1e5be0ae..ea19938bd5 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj @@ -10,6 +10,7 @@ <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> @@ -44,10 +45,9 @@ <Compile Include="Surfaces.cs" /> <Compile Include="Vector.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 d5c72559ec..dc31f186a2 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj @@ -30,11 +30,9 @@ <ItemGroup> <Compile Include="SeekUnroll.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 917d749d41..65726fce85 100644 --- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj @@ -10,6 +10,7 @@ <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 --> @@ -39,10 +40,9 @@ <Compile Include="SparseCompRow.cs" /> <Compile Include="Stopwatch.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 c08d1cd14b..e28565bb52 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Deserialize.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 04798526f9..235de76463 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Serialize.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 a871713d1d..0427657cf5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -12,6 +12,7 @@ <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' "> @@ -34,11 +35,9 @@ <ItemGroup> <Compile Include="Indexer.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 7404828bcd..f3bcfa2ed9 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -12,6 +12,7 @@ <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' "> @@ -33,11 +34,9 @@ <ItemGroup> <Compile Include="SpanBench.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 ec9e4e1bbf..ff54fab733 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Crypto.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 f81039d693..50c8420691 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj @@ -10,6 +10,7 @@ <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> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Richards.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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 0489b0a8b0..6932f71cae 100644 --- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj +++ b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj @@ -28,10 +28,9 @@ <ItemGroup> <Compile Include="RunBenchmarks.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj index 46b4b8e24f..949136259b 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b51817.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj index fb24d78107..bb1bf4d139 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52593.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj index 2358d4970f..68a40de4bd 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52733.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj index 26cd0e80c3..509a6628ea 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52840.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj index 3c046ea754..99cdb6ebbb 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b53226a.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj index 9acb19163a..3bd0fa0fa7 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b53226b.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj index 1067ba1e42..390448cfd3 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b66533.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> 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 2d330449a1..d6d753abaa 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> 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 1d20f00012..1b7f8a70b5 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj @@ -33,11 +33,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 6107b7f18d..7bdd3d7238 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj @@ -28,10 +28,9 @@ <ItemGroup> <Compile Include="GitHub_8231.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <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/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj index 238a9b609a..db2490dda9 100644 --- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj +++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="_5mvazhg.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj index 30b8c4b97e..a3fbd8a948 100644 --- a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj +++ b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj @@ -20,9 +20,10 @@ <ItemGroup> <Compile Include="DoWhileBndChk.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> 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..0f2937aac4 --- /dev/null +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -0,0 +1,98 @@ +<?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> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</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.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>1.0.2-prerelease-00177</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+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json deleted file mode 100644 index d785552820..0000000000 --- a/tests/src/JIT/config/benchmark+roslyn/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "System.Console": "4.4.0-beta-24913-02", - "System.Dynamic.Runtime": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview2-25316-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} 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..c0cb32f119 --- /dev/null +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -0,0 +1,98 @@ +<?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> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</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>1.0.2-prerelease-00177</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+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json deleted file mode 100644 index 402884f56c..0000000000 --- a/tests/src/JIT/config/benchmark+serialize/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "Newtonsoft.Json": "7.0.1", - "System.Console": "4.4.0-beta-24913-02", - "System.IO": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.ObjectModel": "4.4.0-beta-24913-02", - "System.Dynamic.Runtime": "4.4.0-beta-24913-02", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "System.Xml.XmlSerializer": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj new file mode 100644 index 0000000000..c7a5d57116 --- /dev/null +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -0,0 +1,113 @@ +<?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> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</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>4.4.0-preview2-25302-03</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.CompilerServices.Unsafe"> + <Version>4.4.0-preview2-25302-03</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.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>1.0.2-prerelease-00177</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/project.json b/tests/src/JIT/config/benchmark/project.json deleted file mode 100644 index 46b9a694e5..0000000000 --- a/tests/src/JIT/config/benchmark/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "System.Collections.NonGeneric": "4.4.0-beta-24913-02", - "System.Console": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.Linq.Parallel": "4.4.0-beta-24913-02", - "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Memory": "4.4.0-preview2-25316-01", - "System.Numerics.Vectors": "4.4.0-preview2-25316-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25316-01", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Threading.ThreadPool": "4.4.0-beta-24913-02", - "System.Diagnostics.Process": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj index f71ad15a05..8be1cb04bf 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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 0bfc25ff45..75da709ced 100644 --- a/tests/src/JIT/opt/Devirtualization/override.ilproj +++ b/tests/src/JIT/opt/Devirtualization/override.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <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/TestWrappersConfig/TestWrappersConfig.csproj b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj new file mode 100644 index 0000000000..80f52a0259 --- /dev/null +++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj @@ -0,0 +1,37 @@ +<?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> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <CLRTestKind>BuildOnly</CLRTestKind> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.assert"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.core"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.msbuild"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFrameworks>netcoreapp1.1;net45</TargetFrameworks> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <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/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json deleted file mode 100644 index 975651896a..0000000000 --- a/tests/src/TestWrappersConfig/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "xunit": "2.2.0-beta2-build3300", - "xunit.assert": "2.2.0-beta2-build3300", - "xunit.core": "2.2.0-beta2-build3300", - "xunit.runner.msbuild": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net45": { - "imports": "portable-net45+win8" - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/dir.props b/tests/src/dir.props index cb976cc081..abad765fe4 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -13,6 +13,7 @@ <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning> <!-- Set the project.json directory for generated TestWrappers. --> <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory> + <AssemblyKey>Test</AssemblyKey> </PropertyGroup> <!-- Expose the target OS in a more convenient fashion --> @@ -75,16 +76,22 @@ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> </PropertyGroup> + <!-- Don't reference the mscorlib facade --> + <PropertyGroup> + <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade> + </PropertyGroup> + <!-- Set default ZapRequire level (used only when CrossGen is enabled) --> <PropertyGroup> <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire> </PropertyGroup> <PropertyGroup> - <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath> <!-- Specify the target framework of the common test dependency project.json. --> <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort> + <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> </PropertyGroup> </Project> diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 08c77df7cf..4e6c618021 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -50,11 +50,6 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun> </PropertyGroup> - <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> - <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson> - </PropertyGroup> - <!-- If it needs ProjectToRun, turn the project into a ProjectReference so it gets built --> @@ -189,4 +184,13 @@ DestinationFolder="$(OutputPath)" Condition="Exists('$(AssemblyName).reflect.xml')"/> </Target> + + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + + <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> + <ProjectAssetsFile></ProjectAssetsFile > + </PropertyGroup> + </Project> diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj index e49ab945a7..6ae2b7c09e 100644 --- a/tests/src/dirs.proj +++ b/tests/src/dirs.proj @@ -23,9 +23,11 @@ <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> <DisabledProjects Include="Common\targeting_pack_ref\targeting_pack_ref.csproj" /> <DisabledProjects Include="Common\external\external.csproj" /> - <DisabledProjects Include="Common\external\external.depproj" /> + <DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" /> <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" /> <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" /> + <DisabledProjects Include="JIT\config\**" /> + <DisabledProjects Include="Performance\performance.csproj" /> <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" /> <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 --> </ItemGroup> diff --git a/tests/src/performance/linkbench/linkbench.csproj b/tests/src/performance/linkbench/linkbench.csproj index 2a3048ab21..46c79ff039 100644 --- a/tests/src/performance/linkbench/linkbench.csproj +++ b/tests/src/performance/linkbench/linkbench.csproj @@ -16,6 +16,7 @@ <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <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'"> @@ -23,8 +24,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> </PropertyGroup> <PropertyGroup> - <ProjectJson>..\project.json</ProjectJson> - <ProjectLockJson>..\project.lock.json</ProjectLockJson> + <RestoreOutputPath>..\obj</RestoreOutputPath> </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj index ed197261fb..ccacb0b66c 100644 --- a/tests/src/performance/perflab/PerfLab.csproj +++ b/tests/src/performance/perflab/PerfLab.csproj @@ -12,6 +12,7 @@ <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'"> @@ -19,8 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> </PropertyGroup> <PropertyGroup> - <ProjectJson>..\project.json</ProjectJson> - <ProjectLockJson>..\project.lock.json</ProjectLockJson> + <RestoreOutputPath>..\obj</RestoreOutputPath> </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj new file mode 100644 index 0000000000..49659691bf --- /dev/null +++ b/tests/src/performance/performance.csproj @@ -0,0 +1,110 @@ +<?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.5</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.5</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</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>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.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.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.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.5</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/performance/project.json b/tests/src/performance/project.json deleted file mode 100644 index 8746053f7e..0000000000 --- a/tests/src/performance/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "System.Collections.NonGeneric": "4.4.0-beta-24913-02", - "System.Console": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview2-25316-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Loader": "4.0.0", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Diagnostics.Process": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "System.Xml.XPath": "4.4.0-beta-24913-02", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} |