From 798387ee90d7536d5a620af8482100ba76f6061a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 2 May 2017 16:33:41 -0700 Subject: [PATCH] Update Coreclr to 2.0.0 buildtools --- .gitignore | 3 + BuildToolsVersion.txt | 2 +- DotnetCLIVersion.txt | 2 +- Tools-Override/codeOptimization.targets | 118 ------------- Tools-Override/depProj.targets | 131 --------------- Tools-Override/resources.targets | 76 --------- build-test.cmd | 21 +-- build.proj | 3 +- config.json | 6 - dir.props | 11 +- init-tools.cmd | 57 +++---- init-tools.msbuild | 16 ++ init-tools.sh | 101 +++-------- run.cmd | 3 - run.sh | 3 - .../.nuget/init/init.csproj | 15 +- src/.nuget/init/project.json | 10 -- src/.nuget/init/readme.txt | 1 - src/ToolBox/SOS/NETCore/SOS.NETCore.csproj | 21 ++- src/ToolBox/SOS/NETCore/project.json | 15 -- src/mscorlib/System.Private.CoreLib.csproj | 1 + tests/build.proj | 48 +++--- tests/dir.props | 7 +- tests/issues.targets | 9 + tests/override.targets | 13 +- tests/publishdependency.targets | 16 +- tests/runtest.proj | 6 +- tests/runtest.sh | 12 -- tests/scripts/project.json | 2 +- tests/scripts/run-xunit-perf.cmd | 4 +- tests/scripts/scripts.csproj | 35 ++++ tests/setup-runtime-dependencies.cmd | 145 ---------------- tests/setup-runtime-dependencies.sh | 159 ------------------ tests/src/Common/PerfHarness/PerfHarness.cs | 2 +- .../src/Common/PerfHarness/PerfHarness.csproj | 15 ++ tests/src/Common/PerfHarness/project.json | 19 --- .../build_against_pkg_dependencies.csproj | 24 ++- .../project.json | 35 ---- tests/src/Common/empty/project.json | 19 --- tests/src/Common/external/external.depproj | 45 ++++- tests/src/Common/external/project.json | 26 --- tests/src/Common/netcoreapp/project.json | 9 - .../Common/targeting_pack_ref/project.json | 25 --- .../targeting_pack_ref.csproj | 13 ++ .../src/Common/test_dependencies/project.json | 34 ---- .../test_dependencies.csproj | 30 +++- tests/src/Common/test_runtime/project.json | 33 ---- .../Common/test_runtime/test_runtime.csproj | 28 ++- .../JIT/CheckProjects/CheckProjects.csproj | 7 +- .../TypedReference/TypedReference.csproj | 7 +- .../JIT/Directed/UnrollLoop/loop6_cs_d.csproj | 7 +- .../Directed/UnrollLoop/loop6_cs_do.csproj | 7 +- .../JIT/Directed/UnrollLoop/loop6_cs_r.csproj | 7 +- .../Directed/UnrollLoop/loop6_cs_ro.csproj | 7 +- .../Methodical/Boxing/morph/sin3double.ilproj | 8 +- .../Methodical/VT/etc/_dbggc_nested.csproj | 7 +- .../JIT/Methodical/VT/etc/_dbgnested.csproj | 7 +- .../Methodical/VT/etc/_relgc_nested.csproj | 7 +- .../JIT/Methodical/VT/etc/_relnested.csproj | 7 +- .../VT/etc/_speed_dbggc_nested.csproj | 7 +- .../Methodical/VT/etc/_speed_dbgnested.csproj | 7 +- .../VT/etc/_speed_relgc_nested.csproj | 7 +- .../Methodical/VT/etc/_speed_relnested.csproj | 7 +- .../JIT/Methodical/VT/etc/gc_nested.csproj | 7 +- tests/src/JIT/Methodical/VT/etc/nested.csproj | 7 +- .../acceptance/Boxing/boxing001.ilproj | 8 +- .../JIT/Methodical/refany/_dbggcreport.csproj | 7 +- .../JIT/Methodical/refany/_dbgnative.csproj | 7 +- .../JIT/Methodical/refany/_dbgstress1.csproj | 7 +- .../JIT/Methodical/refany/_dbgstress3.csproj | 7 +- .../JIT/Methodical/refany/_dbgvirtcall.csproj | 7 +- .../JIT/Methodical/refany/_relgcreport.csproj | 7 +- .../JIT/Methodical/refany/_relnative.csproj | 7 +- .../JIT/Methodical/refany/_relstress1.csproj | 7 +- .../JIT/Methodical/refany/_relstress3.csproj | 7 +- .../JIT/Methodical/refany/_relvirtcall.csproj | 7 +- .../refany/_speed_dbggcreport.csproj | 7 +- .../Methodical/refany/_speed_dbgnative.csproj | 7 +- .../refany/_speed_dbgstress1.csproj | 7 +- .../refany/_speed_dbgstress3.csproj | 7 +- .../refany/_speed_dbgvirtcall.csproj | 7 +- .../refany/_speed_relgcreport.csproj | 7 +- .../Methodical/refany/_speed_relnative.csproj | 7 +- .../refany/_speed_relstress1.csproj | 7 +- .../refany/_speed_relstress3.csproj | 7 +- .../refany/_speed_relvirtcall.csproj | 7 +- tests/src/JIT/Methodical/refany/array1.csproj | 7 +- tests/src/JIT/Methodical/refany/array2.csproj | 7 +- tests/src/JIT/Methodical/refany/format.csproj | 7 +- .../src/JIT/Methodical/refany/gcreport.csproj | 7 +- tests/src/JIT/Methodical/refany/lcs.csproj | 7 +- tests/src/JIT/Methodical/refany/native.csproj | 7 +- .../src/JIT/Methodical/refany/virtcall.csproj | 7 +- .../xxobj/operand/_dbgrefanyval.csproj | 7 +- .../xxobj/operand/_relrefanyval.csproj | 7 +- .../xxobj/operand/_speed_dbgrefanyval.csproj | 7 +- .../xxobj/operand/_speed_relrefanyval.csproj | 7 +- .../Methodical/xxobj/operand/refanyval.csproj | 7 +- .../CodeQuality/BenchF/Adams/Adams.csproj | 8 +- .../BenchF/BenchMk2/BenchMk2.csproj | 8 +- .../BenchF/BenchMrk/BenchMrk.csproj | 8 +- .../CodeQuality/BenchF/Bisect/Bisect.csproj | 8 +- .../CodeQuality/BenchF/DMath/DMath.csproj | 8 +- .../CodeQuality/BenchF/FFT/FFT.csproj | 8 +- .../CodeQuality/BenchF/InProd/InProd.csproj | 8 +- .../CodeQuality/BenchF/InvMt/InvMt.csproj | 8 +- .../CodeQuality/BenchF/LLoops/LLoops.csproj | 8 +- .../CodeQuality/BenchF/Lorenz/Lorenz.csproj | 8 +- .../CodeQuality/BenchF/MatInv4/MatInv4.csproj | 8 +- .../CodeQuality/BenchF/NewtE/NewtE.csproj | 8 +- .../CodeQuality/BenchF/NewtR/NewtR.csproj | 8 +- .../CodeQuality/BenchF/Regula/Regula.csproj | 8 +- .../CodeQuality/BenchF/Romber/Romber.csproj | 8 +- .../CodeQuality/BenchF/Secant/Secant.csproj | 8 +- .../CodeQuality/BenchF/Simpsn/Simpsn.csproj | 8 +- .../CodeQuality/BenchF/SqMtx/SqMtx.csproj | 8 +- .../CodeQuality/BenchF/Trap/Trap.csproj | 8 +- .../CodeQuality/BenchF/Whetsto/Whetsto.csproj | 8 +- .../CodeQuality/BenchI/8Queens/8Queens.csproj | 8 +- .../BenchI/Ackermann/Ackermann.csproj | 8 +- .../BenchI/AddArray/AddArray.csproj | 8 +- .../BenchI/AddArray2/AddArray2.csproj | 8 +- .../CodeQuality/BenchI/Array1/Array1.csproj | 8 +- .../CodeQuality/BenchI/Array2/Array2.csproj | 8 +- .../CodeQuality/BenchI/BenchE/BenchE.csproj | 8 +- .../BenchI/BubbleSort/BubbleSort.csproj | 8 +- .../BenchI/BubbleSort2/BubbleSort2.csproj | 8 +- .../CodeQuality/BenchI/CSieve/CSieve.csproj | 8 +- .../CodeQuality/BenchI/Fib/Fib.csproj | 8 +- .../BenchI/HeapSort/HeapSort.csproj | 8 +- .../BenchI/IniArray/IniArray.csproj | 8 +- .../BenchI/LogicArray/LogicArray.csproj | 8 +- .../BenchI/Midpoint/Midpoint.csproj | 8 +- .../BenchI/MulMatrix/MulMatrix.csproj | 8 +- .../BenchI/NDhrystone/NDhrystone.csproj | 8 +- .../BenchI/Permutate/Permutate.csproj | 8 +- .../CodeQuality/BenchI/Pi/Pi.csproj | 8 +- .../CodeQuality/BenchI/Puzzle/Puzzle.csproj | 8 +- .../BenchI/QuickSort/QuickSort.csproj | 8 +- .../BenchI/TreeInsert/TreeInsert.csproj | 8 +- .../BenchI/TreeSort/TreeSort.csproj | 8 +- .../BenchI/XposMatrix/XposMatrix.csproj | 8 +- .../binarytrees/binarytrees.csproj | 9 +- .../binarytrees/binarytrees3.csproj | 9 +- .../BenchmarksGame/fasta/fasta.csproj | 8 +- .../fastaredux/fastaredux.csproj | 8 +- .../k-nucleotide/k-nucleotide.csproj | 9 +- .../BenchmarksGame/nbody/nbody.csproj | 8 +- .../BenchmarksGame/pidigits/pi-digits.csproj | 8 +- .../BenchmarksGame/regexdna/regexdna.csproj | 9 +- .../BenchmarksGame/revcomp/revcomp.csproj | 9 +- .../spectralnorm/spectralnorm.csproj | 8 +- .../CodeQuality/Burgers/Burgers.csproj | 8 +- .../CodeQuality/Bytemark/Bytemark.csproj | 8 +- .../FractalPerf/FractalPerf.csproj | 8 +- .../Inlining/InlineGCStruct.csproj | 8 +- .../CodeQuality/Inlining/NoThrowInline.csproj | 9 +- .../Performance/CodeQuality/Linq/Linq.csproj | 8 +- .../Math/Functions/Functions.csproj | 3 +- .../CodeQuality/Roslyn/CscBench.csproj | 8 +- .../SIMD/ConsoleMandel/ConsoleMandel.csproj | 8 +- .../SIMD/RayTracer/RayTracer.csproj | 8 +- .../SIMD/SeekUnroll/SeekUnroll.csproj | 8 +- .../CodeQuality/SciMark/SciMark.csproj | 8 +- .../Serialization/Deserialize.csproj | 8 +- .../Serialization/Serialize.csproj | 8 +- .../CodeQuality/Span/Indexer.csproj | 9 +- .../CodeQuality/Span/SpanBench.csproj | 9 +- .../CodeQuality/V8/Crypto/Crypto.csproj | 8 +- .../CodeQuality/V8/Richards/Richards.csproj | 8 +- .../RunBenchmarks/RunBenchmarks.csproj | 7 +- .../V1-M12-Beta2/b51817/b51817.csproj | 7 +- .../V1-M12-Beta2/b52593/b52593.csproj | 7 +- .../V1-M12-Beta2/b52733/b52733.csproj | 7 +- .../V1-M12-Beta2/b52840/b52840.csproj | 7 +- .../V1-M12-Beta2/b53226/b53226a.csproj | 7 +- .../V1-M12-Beta2/b53226/b53226b.csproj | 7 +- .../V1-M12-Beta2/b66533/b66533.csproj | 7 +- .../JitBlue/GitHub_7906/GitHub_7906.csproj | 8 +- .../JitBlue/GitHub_8220/GitHub_8220.csproj | 8 +- .../JitBlue/GitHub_8231/GitHub_8231.csproj | 7 +- .../V1.2-Beta1/b302509/b302509.csproj | 7 +- tests/src/JIT/RyuJIT/DoWhileBndChk.csproj | 7 +- .../benchmark+roslyn/benchmark+roslyn.csproj | 98 +++++++++++ .../JIT/config/benchmark+roslyn/project.json | 38 ----- .../benchmark+serialize.csproj | 98 +++++++++++ .../config/benchmark+serialize/project.json | 38 ----- .../src/JIT/config/benchmark/benchmark.csproj | 113 +++++++++++++ tests/src/JIT/config/benchmark/project.json | 43 ----- .../opt/Devirtualization/GitHub_9945_2.ilproj | 8 +- .../JIT/opt/Devirtualization/override.ilproj | 8 +- .../TestWrappersConfig.csproj | 37 ++++ tests/src/TestWrappersConfig/project.json | 32 ---- tests/src/dir.props | 11 +- tests/src/dir.targets | 14 +- tests/src/dirs.proj | 4 +- .../performance/linkbench/linkbench.csproj | 4 +- tests/src/performance/perflab/PerfLab.csproj | 4 +- tests/src/performance/performance.csproj | 110 ++++++++++++ tests/src/performance/project.json | 42 ----- tests/testsFailingOutsideWindows.txt | 3 + tests/xunitwrapper.targets | 4 +- 202 files changed, 1375 insertions(+), 1787 deletions(-) delete mode 100644 Tools-Override/codeOptimization.targets delete mode 100644 Tools-Override/depProj.targets delete mode 100644 Tools-Override/resources.targets create mode 100644 init-tools.msbuild rename tests/src/Common/external/external.csproj => src/.nuget/init/init.csproj (53%) delete mode 100644 src/.nuget/init/project.json delete mode 100644 src/.nuget/init/readme.txt delete mode 100644 src/ToolBox/SOS/NETCore/project.json create mode 100644 tests/scripts/scripts.csproj delete mode 100755 tests/setup-runtime-dependencies.cmd delete mode 100755 tests/setup-runtime-dependencies.sh create mode 100644 tests/src/Common/PerfHarness/PerfHarness.csproj delete mode 100644 tests/src/Common/PerfHarness/project.json delete mode 100644 tests/src/Common/build_against_pkg_dependencies/project.json delete mode 100644 tests/src/Common/empty/project.json delete mode 100644 tests/src/Common/external/project.json delete mode 100644 tests/src/Common/netcoreapp/project.json delete mode 100644 tests/src/Common/targeting_pack_ref/project.json delete mode 100644 tests/src/Common/test_dependencies/project.json delete mode 100644 tests/src/Common/test_runtime/project.json create mode 100644 tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj delete mode 100644 tests/src/JIT/config/benchmark+roslyn/project.json create mode 100644 tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj delete mode 100644 tests/src/JIT/config/benchmark+serialize/project.json create mode 100644 tests/src/JIT/config/benchmark/benchmark.csproj delete mode 100644 tests/src/JIT/config/benchmark/project.json create mode 100644 tests/src/TestWrappersConfig/TestWrappersConfig.csproj delete mode 100644 tests/src/TestWrappersConfig/project.json create mode 100644 tests/src/performance/performance.csproj delete mode 100644 tests/src/performance/project.json diff --git a/.gitignore b/.gitignore index 0e66b98800a4..4f2797602f0c 100644 --- a/.gitignore +++ b/.gitignore @@ -149,8 +149,11 @@ publish/ # NuGet Packages *.nupkg +*.nuget.g.props +*.nuget.g.targets **/packages/* project.lock.json +project.assets.json # Windows Azure Build Output csx/ diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 591e3c8e3347..268988da68d1 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01413-01 \ No newline at end of file +2.0.0-prerelease-01528-03 \ No newline at end of file diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index e42fc5fdff1d..32aae90d8a61 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0-preview2-1-003182 \ No newline at end of file +2.0.0-preview1-005724 \ No newline at end of file diff --git a/Tools-Override/codeOptimization.targets b/Tools-Override/codeOptimization.targets deleted file mode 100644 index 4db340f15e74..000000000000 --- a/Tools-Override/codeOptimization.targets +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - 2.0.0-rc-61101-16 - RoslynDependencies.OptimizationData - $(ToolsDir)OptimizationData/ - true - true - - - - - - - - @(ResolvedOptionalToolReferences) - - - - - $(OptimizationDataDir)$(AssemblyName).dll - $(OptimizationDataDir)$(AssemblyName).pgo - - - - - - - - - - - - - - - - - - - - - @(ResolvedOptionalToolReferences) - - - - $(IntermediateOutputPath)/OptimizedAssembly - $(OptimizedAssemblyDir)/$(AssemblyName).dll - - - - - -q -f -mo $(OptimizedAssemblyFile) -incremental $(OptimizationDataDir)$(AssemblyName).pgo - $(IBCMergeArguments) -partialNGEN -minify - - - - - - - - - - - - - - - - - - - - - - - - - - <_OptimizationDataJsonLine Include="{"dependencies": {" /> - <_OptimizationDataJsonLine Include=""$(OptimizationDataPackageName)" : "$(OptimizationDataVersion)" " /> - <_OptimizationDataJsonLine Include="},"frameworks": {"netcoreapp1.0": {},"net46": {}}}"/> - - - - $(OptimizationDataDir)project.json - https:%2F%2Fdotnet.myget.org/F/roslyn/api/v3/index.json - - - - - - - - - - - <_OptimizationDataFiles Include="$(PackagesDir)/$(OptimizationDataPackageName)/$(OptimizationDataVersion)/content/OptimizationData/*.pgo" /> - - - - - \ No newline at end of file diff --git a/Tools-Override/depProj.targets b/Tools-Override/depProj.targets deleted file mode 100644 index ea321237414f..000000000000 --- a/Tools-Override/depProj.targets +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - ReferenceCopyLocalPaths - - - false - - - None - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - %(FileName)%(Extension) - - - - - - - - - - - - - - - - - - - - - true - - - - - - <_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/> - <_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')"> - %(Identity) - - - <_nuGetDeployByFileNameToRemove Include="@(_nuGetDeployByFileName)" Exclude="@(FileToInclude)" Condition="'@(FileToInclude)' != ''" /> - <_filteredNuGetDeployByFileName Include="@(_nuGetDeployByFileName)" Exclude="@(_nuGetDeployByFileNameToRemove);@(FileToExclude)" /> - - <_nuGetDeployByPackageId Include="@(_filteredNuGetDeployByFileName->'%(NuGetPackageId)')" /> - - <_nuGetDeployByPackageIdToRemove Include="@(_nuGetDeployByPackageId)" Exclude="@(PackageToInclude)" Condition="'@(PackageToInclude)' != ''" /> - <_filteredNuGetDeployByPackageId Include="@(_nuGetDeployByPackageId)" Exclude="@(_nuGetDeployByPackageIdToRemove);@(PackageToExclude)" /> - - - - - - - - - - - - diff --git a/Tools-Override/resources.targets b/Tools-Override/resources.targets deleted file mode 100644 index 82ce179ac714..000000000000 --- a/Tools-Override/resources.targets +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - CurrentRuntime - CurrentArchitecture - - - - $(MSBuildProjectDirectory)/Resources/ - $(ResourcesSourceOutputDirectory)/Strings.resx - $(IntermediateOutputPath)SR.cs - $(IntermediateOutputPath)SR.vb - $(DefineConstants);DEBUGRESOURCES - - - - - GenerateResourcesSource; - $(CompileDependsOn); - - - - - - - - - - - - - - - - - - - - - - true - FxResources.$(AssemblyName).SR.resources - - - - - - - - - - true - Resources/Common/SR.cs - - - - - - - true - Resources/Common/SR.vb - - - - - - - diff --git a/build-test.cmd b/build-test.cmd index 21f54ef91fa6..6291f502ec07 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -77,7 +77,6 @@ if /i "%1" == "release" (set __BuildType=Release&set processedArgs if /i "%1" == "checked" (set __BuildType=Checked&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skipmanaged" (set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "updateinvalidpackages" (set __UpdateInvalidPackagesArg=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if /i "%1" == "buildagainstpackages" (set __ZipTests=1&set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "ziptests" (set __ZipTests=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) @@ -146,17 +145,6 @@ REM === REM ========================================================================================= call "%__ProjectDir%\init-tools.cmd" -REM ========================================================================================= -REM === -REM === Resolve runtime dependences -REM === -REM ========================================================================================= -call "%__TestDir%\setup-runtime-dependencies.cmd" /arch %__BuildArch% /outputdir %__BinDir% - -if defined __UpdateInvalidPackagesArg ( - goto skipnative -) - REM ========================================================================================= REM === REM === Native test build section @@ -240,7 +228,7 @@ REM ============================================================================ if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir% set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root" -call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -UpdateDependencies -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% +call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% set __BuildLogRootName=Tests_GenerateRuntimeLayout @@ -277,11 +265,7 @@ if not defined VSINSTALLDIR ( exit /b 1 ) -if defined __UpdateInvalidPackagesArg ( - set __up=-updateinvalidpackageversions -) - -call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__up% %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% +call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: echo %__BuildLog% @@ -428,7 +412,6 @@ echo. echo. -? -h -help: view this message. echo Build architecture: -buildArch: only x64 is currently allowed ^(default: x64^). echo Build type: -buildType: one of Debug, Checked, Release ^(default: Debug^). -echo updateinvalidpackageversions: Runs the target to update package versions. echo buildagainstpackages: builds tests against restored packages, instead of against a built product. echo runtimeid ^: Builds a test overlay for the specified OS (Only supported when building against packages). Supported IDs are: echo alpine.3.4.3-x64: Builds overlay for Alpine 3.4.3 diff --git a/build.proj b/build.proj index 07bb11a9225f..b2f6cffb1f2f 100644 --- a/build.proj +++ b/build.proj @@ -40,7 +40,8 @@ - + diff --git a/config.json b/config.json index 5f493f6521d3..3bc7e6994f91 100644 --- a/config.json +++ b/config.json @@ -348,12 +348,6 @@ "values": [ "debian.8-x64", "fedora.24-x64", "fedora.25-x64", "opensuse.42.1-x64", "osx.10.12-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ], "defaultValue": "${__RuntimeId}" }, - "UpdateDependencies": { - "description": "MsBuild target that updates project.json dependencies.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, "BatchRestorePackages": { "description": "MsBuild target that restores the packages.", "valueType": "target", diff --git a/dir.props b/dir.props index de2c0f8b9240..7c45b51e55db 100644 --- a/dir.props +++ b/dir.props @@ -103,7 +103,8 @@ $(NugetRestoreCommand) install - $(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))" + $(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))" + $(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\'))" $(NugetRestoreCommand) $(NuGetConfigCommandLine) $(NugetRestoreCommand) -Verbosity detailed mono $(NuGetRestoreCommand) @@ -113,9 +114,10 @@ $(DotnetCliPath)dotnet.exe $(DotnetCliPath)dotnet - $(DnuRestoreCommand) "$(DotnetToolCommand)" + "$(DotnetToolCommand)" $(DnuRestoreCommand) restore - $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))" + $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))" + $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\'))" @@ -146,7 +148,8 @@ $(BaseIntermediateOutputPath) - $(PackagesDir)/Microsoft.NETCore.Platforms/1.0.2-beta-24224-02/runtime.json + 1.0.2-beta-24224-02 + $(PackagesDir)/microsoft.netcore.platforms/$(RuntimeIdGraphDefinitionVersion)/runtime.json https://go.microsoft.com/fwlink/?LinkID=799421 diff --git a/init-tools.cmd b/init-tools.cmd index 8efc2f400d28..b69239bfe6de 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -2,20 +2,15 @@ setlocal set INIT_TOOLS_LOG=%~dp0init-tools.log -set PACKAGES_DIR=%~dp0packages\ -set TOOLRUNTIME_DIR=%~dp0Tools -:: This is an isolated script that handles the download of dotnet binaries and shall be removed after bootstrap.ps1/sh refactor (dotnet/corefx#15427) -set DOTNET_DOWNLOAD_PATH=%~dp0dotnet-download.ps1 +if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\ +if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\ -set DOTNET_CMD=%DOTNET_PATH%dotnet.exe +if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt" set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\ -set PROJECT_JSON_PATH=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION% -set PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.json -set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" , "Microsoft.DotNet.BuildTools.Coreclr": "1.0.4-prerelease"}, "frameworks": { "dnxcore50": { } } } -set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed0 -set TOOLS_INIT_RETURN_CODE=0 +set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild +set BUILD_TOOLS_SEMAPHORE=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%\init-tools.completed :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated if [%1]==[force] ( @@ -26,7 +21,7 @@ if [%1]==[force] ( :: If sempahore exists do nothing if exist "%BUILD_TOOLS_SEMAPHORE%" ( echo Tools are already initialized. - goto :DONE + goto :EOF ) if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" @@ -37,8 +32,6 @@ if NOT exist "%PACKAGES_DIR%NuGet.exe" ( powershell -NoProfile -ExecutionPolicy unrestricted -Command "(New-Object Net.WebClient).DownloadFile('https://www.nuget.org/nuget.exe', '%PACKAGES_DIR%NuGet.exe') ) -if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%" -echo %PROJECT_JSON_CONTENTS% > "%PROJECT_JSON_FILE%" echo Running %0 > "%INIT_TOOLS_LOG%" set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" @@ -46,47 +39,39 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" -if [%PROCESSOR_ARCHITECTURE%]==[x86] (set DOTNET_ZIP_NAME=dotnet-dev-win-x86.%DOTNET_VERSION%.zip) else (set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip) -set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% +set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip +set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" -powershell -NoProfile -ExecutionPolicy unrestricted -File %DOTNET_DOWNLOAD_PATH% -DotnetRemotePath %DOTNET_REMOTE_PATH% -DotnetLocalPath %DOTNET_LOCAL_PATH% -DotnetPath %DOTNET_PATH% >> "%INIT_TOOLS_LOG%" +powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" if NOT exist "%DOTNET_LOCAL_PATH%" ( - echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details. - set TOOLS_INIT_RETURN_CODE=1 - goto :DONE + echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 + exit /b 1 ) :afterdotnetrestore if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages "%PACKAGES_DIR% " --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" -call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages "%PACKAGES_DIR% " --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" +echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" +call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( - echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. - set TOOLS_INIT_RETURN_CODE=1 - goto :DONE + echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 + exit /b 1 ) :afterbuildtoolsrestore -echo Initializing BuildTools ... +echo Initializing BuildTools... echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" - -echo Updating CLI NuGet Frameworks map... -robocopy "%TOOLRUNTIME_DIR%" "%TOOLRUNTIME_DIR%\dotnetcli\sdk\%DOTNET_VERSION%" NuGet.Frameworks.dll /XO >> "%INIT_TOOLS_LOG%" -set UPDATE_CLI_ERRORLEVEL=%ERRORLEVEL% -if %UPDATE_CLI_ERRORLEVEL% GTR 1 ( - echo ERROR: Failed to update Nuget for CLI {Error level %UPDATE_CLI_ERRORLEVEL%}. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2 - exit /b %UPDATE_CLI_ERRORLEVEL% +set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL% +if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( + echo ERROR: An error occured when trying to initialize the tools. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2 + exit /b %INIT_TOOLS_ERRORLEVEL% ) :: Create sempahore file echo Done initializing tools. echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" - -:DONE - -exit /b %TOOLS_INIT_RETURN_CODE% +exit /b 0 \ No newline at end of file diff --git a/init-tools.msbuild b/init-tools.msbuild new file mode 100644 index 000000000000..d9ff7b45170d --- /dev/null +++ b/init-tools.msbuild @@ -0,0 +1,16 @@ + + + netcoreapp1.0 + false + true + $(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion) + + + + $(BuildToolsPackageVersion) + + + 1.0.4-prerelease + + + \ No newline at end of file diff --git a/init-tools.sh b/init-tools.sh index f965583daeb8..b676ba18469c 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -7,63 +7,17 @@ __TOOLRUNTIME_DIR=$__scriptpath/Tools __DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli __DOTNET_CMD=$__DOTNET_PATH/dotnet if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi +export __BUILDTOOLS_USE_CSPROJ=true __BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt) __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt) -__BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PACKAGE_VERSION/lib -__PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION -__PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json -__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"netcoreapp1.0\": { } } }" -__INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done - -# Extended version of platform detection logic from dotnet/cli/scripts/obtain/dotnet-install.sh 16692fc -get_current_linux_name() { - # Detect Distro - if [ "$(cat /etc/os-release | grep -cim1 ubuntu)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 16.04)" -eq 1 ]; then - echo "ubuntu.16.04" - return 0 - fi - if [ "$(cat /etc/os-release | grep -cim1 16.10)" -eq 1 ]; then - echo "ubuntu.16.10" - return 0 - fi - - echo "ubuntu" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 centos)" -eq 1 ]; then - echo "centos" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 rhel)" -eq 1 ]; then - echo "rhel" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 debian)" -eq 1 ]; then - echo "debian" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 alpine)" -eq 1 ]; then - echo "alpine" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 fedora)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 24)" -eq 1 ]; then - echo "fedora.24" - return 0 - fi - if [ "$(cat /etc/os-release | grep -cim1 25)" -eq 1 ]; then - echo "fedora.25" - return 0 - fi - elif [ "$(cat /etc/os-release | grep -cim1 opensuse)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 42.1)" -eq 1 ]; then - echo "opensuse.42.1" - return 0 - fi - fi - - # Cannot determine Linux distribution, assuming Ubuntu 14.04. - echo "ubuntu" - return 0 -} +__BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib +__INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild +__INIT_TOOLS_DONE_MARKER=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/done if [ -z "$__DOTNET_PKG" ]; then + if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then + echo "Warning: build not supported on 32 bit Unix" + fi OSName=$(uname -s) case $OSName in Darwin) @@ -73,14 +27,14 @@ OSName=$(uname -s) ;; Linux) - __DOTNET_PKG="dotnet-dev-$(get_current_linux_name)-x64" + __DOTNET_PKG=dotnet-dev-linux-x64 OS=Linux ;; *) - echo "Unsupported OS '$OSName' detected. Downloading ubuntu-x64 tools." + echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools." OS=Linux - __DOTNET_PKG=dotnet-dev-ubuntu-x64 + __DOTNET_PKG=dotnet-dev-linux-x64 ;; esac fi @@ -103,13 +57,14 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH else echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" + __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" # curl has HTTPS CA trust-issues less often than wget, so lets try that first. echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} - else + which curl > /dev/null 2> /dev/null + if [ $? -ne 0 ]; then wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + else + curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} fi cd $__DOTNET_PATH tar -xf $__DOTNET_PATH/dotnet.tar @@ -128,18 +83,18 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo "Copying $BUILD_TOOLS_TOOL_DIR to $__TOOLRUNTIME_DIR" >> $__init_tools_log cp -r $BUILD_TOOLS_TOOL_DIR/* $__TOOLRUNTIME_DIR else - if [ ! -d "$__PROJECT_JSON_PATH" ]; then mkdir "$__PROJECT_JSON_PATH"; fi - echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE" - if [ ! -e $__BUILD_TOOLS_PATH ]; then echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log - $__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log + $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi fi echo "Initializing BuildTools..." echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log + + # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + chmod +x $__BUILD_TOOLS_PATH/init-tools.sh $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log if [ "$?" != "0" ]; then echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2 @@ -147,18 +102,16 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi fi - if [ $__PATCH_CLI_NUGET_FRAMEWORKS -eq 1 ]; then - echo "Updating CLI NuGet Frameworks map..." - cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION >> $__init_tools_log - if [ "$?" != "0" ]; then - echo "ERROR: An error occured when updating Nuget for CLI . Please check '$__init_tools_log' for more details."1>&2 - exit 1 - fi - fi + echo "Making all .sh files executable under Tools." + # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + ls $__scriptpath/Tools/*.sh | xargs chmod +x + ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x + + Tools/crossgen.sh $__scriptpath/Tools touch $__INIT_TOOLS_DONE_MARKER echo "Done initializing tools." else echo "Tools are already initialized" -fi +fi \ No newline at end of file diff --git a/run.cmd b/run.cmd index 0fae662421d8..cab06d52dd9d 100644 --- a/run.cmd +++ b/run.cmd @@ -48,9 +48,6 @@ if NOT [%ERRORLEVEL%]==[0] ( exit /b 1 ) -:: Always copy over the Tools-Override -xcopy %~dp0Tools-Override\* %~dp0Tools /y >nul - set _toolRuntime=%~dp0Tools set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe set _json=%~dp0config.json diff --git a/run.sh b/run.sh index 2612c86f33c9..bd6a68f2bbb6 100755 --- a/run.sh +++ b/run.sh @@ -5,9 +5,6 @@ working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo "Running init-tools.sh" $working_tree_root/init-tools.sh -# Always copy over the Tools-Override -cp $working_tree_root/Tools-Override/* $working_tree_root/Tools > /dev/null - toolRuntime=$working_tree_root/Tools dotnet=$toolRuntime/dotnetcli/dotnet diff --git a/tests/src/Common/external/external.csproj b/src/.nuget/init/init.csproj similarity index 53% rename from tests/src/Common/external/external.csproj rename to src/.nuget/init/init.csproj index f7fa75ed3296..115090dd7686 100644 --- a/tests/src/Common/external/external.csproj +++ b/src/.nuget/init/init.csproj @@ -5,9 +5,20 @@ Debug AnyCPU BuildOnly - .NETCoreApp,Version=v1.1 + + + + $(RuntimeIdGraphDefinitionVersion) + + + + netcoreapp1.0 + .NETCoreApp + $(PackageTargetFallback);portable-net45+win8 + true + false - \ No newline at end of file + diff --git a/src/.nuget/init/project.json b/src/.nuget/init/project.json deleted file mode 100644 index 5908fcc3f9b4..000000000000 --- a/src/.nuget/init/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02" - }, - "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" - } - }, -} \ No newline at end of file diff --git a/src/.nuget/init/readme.txt b/src/.nuget/init/readme.txt deleted file mode 100644 index 6792dd555f8a..000000000000 --- a/src/.nuget/init/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Please keep the package details listed in project.json in sync with /dir.props. \ No newline at end of file diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj index 44019bce525b..ec3602e66de4 100644 --- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj +++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj @@ -13,6 +13,8 @@ true true true + true + true @@ -39,8 +41,25 @@ + + netcoreapp1.0 + .NETCoreApp + $(PackageTargetFallback);portable-net45+win8 + + - + + $(RuntimeIdGraphDefinitionVersion) + + + 4.0.1 + + + 4.1.0 + + + 1.4.1 + diff --git a/src/ToolBox/SOS/NETCore/project.json b/src/ToolBox/SOS/NETCore/project.json deleted file mode 100644 index a92b1735699d..000000000000 --- a/src/ToolBox/SOS/NETCore/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.IO.FileSystem": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Reflection.Metadata": "1.4.1" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "portable-net45+win8" - ] - } - } -} diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 4a8fdcf4ca37..7cb324456755 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -20,6 +20,7 @@ false + true true true 6.00 diff --git a/tests/build.proj b/tests/build.proj index 518d59ca6929..260afb275a91 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -20,6 +20,23 @@ + + + + + + + + + + + + + + + @(RestoreProjects -> '%(Identity)', ' ') + + @@ -28,32 +45,19 @@ - - - + + + - - - - - - - - - - - - - - + + - + \ No newline at end of file diff --git a/tests/dir.props b/tests/dir.props index 3a9b043b0945..d5533ee252d0 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -36,7 +36,7 @@ $(__RootBinDir)\ - $(ProjectDir)bin\ + $(ProjectDir)..\bin\ @@ -91,7 +91,7 @@ - + @@ -104,9 +104,8 @@ $(DotnetCliPath)dotnet @(DnuSourceList -> '--source %(Identity)', ' ') - @(DnuRestoreDir -> '%(Identity)', ' ') - $(DnuRestoreCommand) "$(DotnetToolCommand)" + "$(DotnetToolCommand)" $(DnuRestoreCommand) restore $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource) diff --git a/tests/issues.targets b/tests/issues.targets index df8fc554d866..a5098f8ed5de 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -184,6 +184,15 @@ 6707 + + + + + + + + + diff --git a/tests/override.targets b/tests/override.targets index a01163225f08..0e7f82bf77be 100644 --- a/tests/override.targets +++ b/tests/override.targets @@ -3,13 +3,13 @@ Overrides for all other targets (including build tools) can go in this file. --> - + + + + <_TargetFrameworkDirectories> + <_FullFrameworkReferenceAssemblyPaths> + diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 6d1c6bdc788f..80d1f71a5285 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -18,16 +18,16 @@ - - + + - + - + @@ -43,10 +43,6 @@ Inputs="@(CoreRootProjectLockJsonFiles)" Outputs="$(CORE_ROOT)\*.*"> - - - - - - - - Library .NETFramework v4.5 + net45 true true {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ BuildOnly true - %24(TestWrappersPackagesConfigFileDirectory)project.json - %24(TestWrappersPackagesConfigFileDirectory)project.lock.json @@ -118,7 +117,8 @@ $(_XunitEpilog) - $(XunitTestBinBase)\$(CategoryWithSlash)\ + $(XunitTestBinBase)\$(CategoryWithSlash)\ + %24(TestWrappersPackagesConfigFileDirectory)obj/project.assets.json ]]> diff --git a/tests/runtest.sh b/tests/runtest.sh index 8291ad4383b5..439bbb66e62c 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -1202,18 +1202,6 @@ else load_failing_tests fi -# Other architectures are not supported yet. -if [ "$ARCH" == "x64" ] -then - scriptPath=$(dirname $0) - ${scriptPath}/setup-runtime-dependencies.sh --outputDir=$coreOverlayDir -else - if [ "$ARCH" != "arm64" ] - then - echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture." - fi -fi - export __TestEnv=$testEnv cd "$testRootDir" diff --git a/tests/scripts/project.json b/tests/scripts/project.json index b3c3a15f627f..394cd2f922a9 100644 --- a/tests/scripts/project.json +++ b/tests/scripts/project.json @@ -15,4 +15,4 @@ ] } } -} +} \ No newline at end of file diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd index 130cb37c3b77..7b1bd3e9b001 100644 --- a/tests/scripts/run-xunit-perf.cmd +++ b/tests/scripts/run-xunit-perf.cmd @@ -35,8 +35,8 @@ setlocal call :set_perf_run_log || exit /b 1 call :setup_sandbox || exit /b 1 - call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" || exit /b 1 - call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" -c Release -o "%CORECLR_REPO%\sandbox" || exit /b 1 + call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\PerfHarness.csproj" || exit /b 1 + call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\PerfHarness.csproj" -c Release -o "%CORECLR_REPO%\sandbox" || exit /b 1 rem TODO: Remove the version of the package to copy. e.g.) if multiple version exist, then error out? call :run_cmd xcopy /sy "%CORECLR_REPO%\packages\Microsoft.Diagnostics.Tracing.TraceEvent\1.0.3-alpha-experimental\lib\native"\* . >> %RUNLOG% || exit /b 1 diff --git a/tests/scripts/scripts.csproj b/tests/scripts/scripts.csproj new file mode 100644 index 000000000000..dca723de8ebe --- /dev/null +++ b/tests/scripts/scripts.csproj @@ -0,0 +1,35 @@ + + + + + + 1.0.0-alpha-build0040 + + + 1.0.0-alpha-build0040 + + + 1.0.0-alpha-build0040 + + + 1.0.0-alpha-build0040 + + + 1.0.2-prerelease-00177 + + + 1.0.0-prerelease-00629-04 + + + + netstandard1.3 + .NETStandard + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + true + false + win7-x86;win7-x64 + + + + \ No newline at end of file diff --git a/tests/setup-runtime-dependencies.cmd b/tests/setup-runtime-dependencies.cmd deleted file mode 100755 index 0079d42f60c2..000000000000 --- a/tests/setup-runtime-dependencies.cmd +++ /dev/null @@ -1,145 +0,0 @@ -@if not defined _echo @echo off -setlocal - -set __ThisScriptShort=%0 -set __ThisScriptFull=%~f0 -set __ThisScriptPath=%~dp0 - -REM ========================================================================================= -REM === -REM === Parse arguments -REM === -REM ========================================================================================= - -set __OutputDir= -set __Arch= - -:Arg_Loop -if "%1" == "" goto ArgsDone - -if /i "%1" == "/?" goto Usage -if /i "%1" == "-?" goto Usage -if /i "%1" == "/h" goto Usage -if /i "%1" == "-h" goto Usage -if /i "%1" == "/help" goto Usage -if /i "%1" == "-help" goto Usage - -if /i "%1" == "/arch" (set __Arch=%2&shift&shift&goto Arg_Loop) -if /i "%1" == "/outputdir" (set __OutputDir=%2&shift&shift&goto Arg_Loop) - -echo Invalid command-line argument: %1 -goto Usage - -:ArgsDone - -if not defined __OutputDir goto Usage -if not defined __Arch goto Usage - -REM Check if the platform is supported -if /i %__Arch% == "arm" ( - echo No runtime dependencies for Arm32. - exit /b 0 - ) - -REM ========================================================================================= -REM === -REM === Check if dotnet CLI and necessary directories exist -REM === -REM ========================================================================================= - -set __DotNetToolDir=%__ThisScriptPath%..\Tools -set __DotNetCmd=%__DotNetToolDir%\dotnetcli\dotnet.exe -set __PackageDir=%__ThisScriptPath%..\Packages -set __TmpDir=%Temp%\coreclr_gcstress_%RANDOM% - -REM Check if dotnet cli exists -if not exist "%__DotNetToolDir%" ( - echo Directory containing dotnet CLI does not exist: %__DotNetToolDir% - goto Fail -) -if not exist "%__DotNetCmd%" ( - echo dotnet.exe does not exist: %__DotNetCmd% - goto Fail -) - -REM Create directories needed -if not exist "%__PackageDir%" md "%__PackageDir%" -if not exist "%__OutputDir%" md "%__OutputDir%" - -REM Check and create a temp directory -if exist "%__TmpDir%" ( - rmdir /S /Q %__TmpDir% -) -mkdir %__TmpDir% - -REM Project.json path -set __JsonFilePath=%__TmpDir%\project.json - -REM ========================================================================================= -REM === -REM === Download packages -REM === -REM ========================================================================================= - -REM Write dependency information to project.json -echo { ^ - "dependencies": { ^ - "runtime.win7-%__Arch%.Microsoft.NETCore.CoreDisTools": "1.0.1-prerelease-*" ^ - }, ^ - "frameworks": { "dnxcore50": { } } ^ - } > "%__JsonFilePath%" - -echo JSON file: %__JsonFilePath% -type "%__JsonFilePath%" - -REM Download the package -echo Downloading CoreDisTools package -set DOTNETCMD="%__DotNetCmd%" restore "%__JsonFilePath%" --source https://dotnet.myget.org/F/dotnet-core/ --packages "%__PackageDir%" -echo %DOTNETCMD% -call %DOTNETCMD% -if errorlevel 1 goto Fail - -REM Get downloaded dll path -echo Locating coredistools.dll -FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i -echo CoreDisTools library path: %__LibPath% -if not exist "%__LibPath%" ( - echo Failed to locate the downloaded library: %__LibPath% - goto Fail -) - -REM Copy library to output directory -echo Copy library: %__LibPath% to %__OutputDir% -copy /y "%__LibPath%" "%__OutputDir%" -if errorlevel 1 ( - echo Failed to copy %__LibPath% to %__OutputDir% - goto Fail -) - -REM Delete temporary files -if exist "%__TmpDir%" ( - rmdir /S /Q "%__TmpDir%" -) - -exit /b 0 - -:Fail -if exist "%__TmpDir%" ( - rmdir /S /Q "%__TmpDir%" -) -exit /b 1 - -REM ========================================================================================= -REM === -REM === Helper routines -REM === -REM ========================================================================================= - -:Usage -echo. -echo Download coredistools for GC stress testing -echo. -echo Usage: -echo %__ThisScriptShort% /arch ^ /outputdir ^ -echo. -exit /b 1 diff --git a/tests/setup-runtime-dependencies.sh b/tests/setup-runtime-dependencies.sh deleted file mode 100755 index 4573e084bd34..000000000000 --- a/tests/setup-runtime-dependencies.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env bash -# set -x - -# -# Constants -# -readonly EXIT_CODE_SUCCESS=0 - -# -# This script should be located in coreclr/tests. -# - -function print_usage { - echo '' - echo 'Download coredistools for GC stress testing' - echo '' - echo 'Command line:' - echo '' - echo './setup-gcstress.sh --outputDir=' - echo '' - echo 'Required arguments:' - echo ' --outputDir= : Directory to install libcoredistools.so' - echo '' -} - -# temorary directory -tmpDirPath= - -function exit_with_error { - local errorCode=$1 - local errorMsg=$2 - - if [ ! -z "$2" ]; then - echo $2 - fi - - if [ -e $tmpDirPath ]; then - rm -rf $tmpDirPath - fi - - exit $errorCode -} - -function handle_ctrl_c { - exit_with_error 1 'Aborted by Ctrl+C' - } - -# Register the Ctrl-C handler -trap handle_ctrl_c INT - -# Argument variables -libInstallDir= - -# Handle arguments -verbose=0 -for i in "$@" -do - case $i in - -h|--help) - exit $EXIT_CODE_SUCCESS - ;; - -v|--verbose) - verbose=1 - ;; - --outputDir=*) - libInstallDir=${i#*=} - ;; - *) - echo "Unknown switch: $i" - print_usage - exit $EXIT_CODE_SUCCESS - ;; - esac -done - -if [ -z "$libInstallDir" ]; then - echo "--libInstallDir is required." - print_usage - exit_with_error 1 -fi - -# create temp directory -tmpDirPath=`mktemp -d` -if [ ! -e $tmpDirPath ]; then - exit_with_error 1 "Cannot create a temporary directory" -fi - -# This script must be located in coreclr/tests. -scriptDir=$(cd "$(dirname "$0")"; pwd -P) - -echo "Running init-tools.sh" -$scriptDir/../init-tools.sh - -dotnetToolsDir=$scriptDir/../Tools -dotnetCmd=${dotnetToolsDir}/dotnetcli/dotnet -packageDir=${scriptDir}/../packages -jsonFilePath=${tmpDirPath}/project.json - -# Check tool directory -if [ ! -e $dotnetToolsDir ]; then - exit_with_error 1 'Directory containing dotnet commandline does not exist:'$dotnetToolsDir -fi -if [ ! -e $dotnetCmd ]; then - exit_with_error 1 'dotnet commandline does not exist:'$dotnetCmd -fi - -# make package directory -if [ ! -e $packageDir ]; then - mkdir -p $packageDir -fi - -# make output directory -if [ ! -e $libInstallDir ]; then - mkdir -p $libInstallDir -fi - -# Query runtime Id -rid=`$dotnetCmd --info | grep 'RID:' | sed 's/^ *RID: *//g'` -if [ -z "$rid" ]; then - exit_with_error 1 "Failed to query runtime Id" -fi - -# Write dependency information to project.json -packageName='runtime.'$rid'.Microsoft.NETCore.CoreDisTools' -echo { \ - \"dependencies\": { \ - \"$packageName\": \"1.0.1-prerelease-*\" \ - }, \ - \"frameworks\": { \"dnxcore50\": { } } \ - } > $jsonFilePath - -# Download the package -echo Downloading CoreDisTools package -bash -c -x "$dotnetCmd restore $jsonFilePath --source https://dotnet.myget.org/F/dotnet-core/ --packages $packageDir" -if [ $? -ne 0 ] -then - exit_with_error 1 "Failed to restore the package" -fi - -# Get library path -libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools` -if [ ! -e $libPath ]; then - exit_with_error 1 'Failed to locate the downloaded library' -fi - -# Copy library to output directory -echo 'Copy library:' $libPath '-->' $libInstallDir/ -cp -f $libPath $libInstallDir -if [ $? -ne 0 ] -then - exit_with_error 1 "Failed to copy the library" -fi - -# Delete temporary files -rm -rf $tmpDirPath - -# Return success -exit $EXIT_CODE_SUCCESS - diff --git a/tests/src/Common/PerfHarness/PerfHarness.cs b/tests/src/Common/PerfHarness/PerfHarness.cs index b3a0ea48c5bf..f78022517bab 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 000000000000..5f9377c2253f --- /dev/null +++ b/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -0,0 +1,15 @@ + + + + Exe + netcoreapp1.1 + + + + 1.0.0-beta-build0003 + + + 1.1.0 + + + \ 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 bed9544b6539..000000000000 --- 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 63c54488f27a..3718f7957834 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 @@ BuildOnly - + + $(CoreClrPackageVersion) + + + $(CoreClrPackageVersion) + + + $(CoreClrPackageVersion) + + + $(CoreClrPackageVersion) + + + $(CoreClrPackageVersion) + + + netcoreapp2.0 + .NETCoreApp + $(PackageTargetFallback);portable-net45+win8 + 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 + true + false + 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 56ee67472812..000000000000 --- 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 e1ec3bfd428a..000000000000 --- 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.depproj b/tests/src/Common/external/external.depproj index 5a16122cdb07..710866f62908 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -5,19 +5,54 @@ - $(MSBuildThisFileDirectory)project.json - $(MSBuildThisFileDirectory)project.lock.json + $(MSBuildThisFileDirectory)obj C# .NETCoreApp,Version=v1.1 + netcoreapp1.1 win7-x64 + true $(TargetingPackPath) xunit.console.netcore xunit.runner.console SharedLibrary - + + 1.1.1 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.3-alpha-experimental + + + 9.0.1 + + + $(XunitPackageVersion) + + + 1.0.2-prerelease-00177 + + + $(XunitPackageVersion) + + + netcoreapp1.1 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + win7-x86;win7-x64 + @@ -40,6 +75,10 @@ + + $(SourceDir)Common\external\obj\project.assets.json + + AnyCPU BuildOnly + + + $(CoreClrPackageVersion) + + + + netcoreapp1.1 + .NETCoreApp + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 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 + true + false + diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json deleted file mode 100644 index 9d1a65842eb5..000000000000 --- 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 0b0f5b82bf3b..65f01bf3a2c1 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -6,8 +6,34 @@ AnyCPU BuildOnly .NETCoreApp,Version=v2.0 + netcoreapp2.0 + + + + 1.0.1-prerelease-* + + + 4.4.0-$(CoreFxExpectedPrerelease) + + + 4.4.0-$(CoreFxExpectedPrerelease) + + + 4.4.0-$(CoreFxExpectedPrerelease) + + + 4.4.0-$(CoreFxExpectedPrerelease) + + + + netcoreapp2.0 + .NETCoreApp + $(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8 + 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 + true + false - + DependsOnTargets="ResolveReferences" /> + \ 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 6c5cd04ef77a..000000000000 --- 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 3b55297f3dc5..7b01268decde 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -5,14 +5,34 @@ Debug AnyCPU BuildOnly - - - .NETCoreApp,Version=v2.0 + netcoreapp2.0 - + + 2.0.0-$(CoreFxExpectedPrerelease) + + + 1.0.0-prerelease + + + 0.0.1.4 + + + 0.0.1.2 + + + 0.0.1.1 + + + netcoreapp2.0 + .NETCoreApp + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 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 + true + false + diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj index 61fe6102eaa8..02d073a3fb9b 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.csproj +++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj @@ -29,10 +29,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + diff --git a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj index 36cd9b760bf4..13a728059d3c 100644 --- a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj +++ b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj @@ -27,9 +27,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj index 953edac9645e..dcef420e0acc 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj index 829c62c4c496..84ef3caf97bc 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj index 3c5f1cc2452e..22e4d5e32ddc 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj index a41f31a39d72..1b0800a1afba 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj index d8ec34de758d..0ae44d99efdb 100644 --- a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj +++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj @@ -32,11 +32,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json \ 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 afe15bbe2d1c..2edd488ce07c 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj index 33039679f75b..3579d2647e94 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj index 7ec86122743a..263832254669 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj index b0b398de80d7..0298dde5d297 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj index 2b1acc4a5c14..d3849b1a1433 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_speed_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj index 97be5fecbd08..4a165d377d6d 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj index 592c20a7b89e..694363a0ce99 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/_speed_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj index 817c22f9c359..ca5a53abba56 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj index f858d0f6bd60..9601e61e1ec2 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj index 11babc318255..c2ba77845c85 100644 --- a/tests/src/JIT/Methodical/VT/etc/nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj index 3d7729f5e794..cfbf44f7b092 100644 --- a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj +++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj @@ -32,11 +32,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json \ 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 c8dd1da34ca0..0e77a28947e9 100644 --- a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_dbgnative.csproj index 1ffea8884486..e8edef3a7c42 100644 --- a/tests/src/JIT/Methodical/refany/_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgnative.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj index eb5c6626f3b7..9704560fab7c 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj index c41462c11090..540ee3c8dc1b 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj index f1b1b10a249f..50a1e714c22d 100644 --- a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_relgcreport.csproj index 8781f33cdb6e..da3914fcdbec 100644 --- a/tests/src/JIT/Methodical/refany/_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_relgcreport.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_relnative.csproj b/tests/src/JIT/Methodical/refany/_relnative.csproj index 50bccd2c9d67..88e840991ce0 100644 --- a/tests/src/JIT/Methodical/refany/_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_relnative.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_relstress1.csproj b/tests/src/JIT/Methodical/refany/_relstress1.csproj index 08cfb0238f43..19a9a552264b 100644 --- a/tests/src/JIT/Methodical/refany/_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress1.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_relstress3.csproj b/tests/src/JIT/Methodical/refany/_relstress3.csproj index 03c37ce53358..65da5b03e365 100644 --- a/tests/src/JIT/Methodical/refany/_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress3.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj index 459da7d6476e..d1e9e6767ca6 100644 --- a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj index 21e1dfb87617..2e39368075ac 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj index f7fde093ded0..8757d50b1a04 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj index 10d26819f49e..10a8cd5f6a80 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj index cfd702ecae9e..124554ed79f0 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj index 531b47a9bcb3..45aad43accb8 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj index 3fb0a8d27f99..a0bc8fff6156 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_relnative.csproj b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj index 11e2afd4bee4..30045fba8263 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_relstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj index f300ebc4aaf4..0e484466b131 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_relstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj index fd6a9aedb9d0..6e160e6e01cf 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/_speed_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj index ecae4158e9b9..ab78d753e8d5 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/array1.csproj b/tests/src/JIT/Methodical/refany/array1.csproj index 83c8927f2d52..8c713ad86484 100644 --- a/tests/src/JIT/Methodical/refany/array1.csproj +++ b/tests/src/JIT/Methodical/refany/array1.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/array2.csproj b/tests/src/JIT/Methodical/refany/array2.csproj index 1890a9c9d050..1d57843df224 100644 --- a/tests/src/JIT/Methodical/refany/array2.csproj +++ b/tests/src/JIT/Methodical/refany/array2.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/format.csproj b/tests/src/JIT/Methodical/refany/format.csproj index 18b8fa8e878a..008ec5fad30a 100644 --- a/tests/src/JIT/Methodical/refany/format.csproj +++ b/tests/src/JIT/Methodical/refany/format.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/gcreport.csproj b/tests/src/JIT/Methodical/refany/gcreport.csproj index 04d0fffb01d3..c40ea0504b98 100644 --- a/tests/src/JIT/Methodical/refany/gcreport.csproj +++ b/tests/src/JIT/Methodical/refany/gcreport.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/lcs.csproj b/tests/src/JIT/Methodical/refany/lcs.csproj index 122a161b4a9a..187948b805de 100644 --- a/tests/src/JIT/Methodical/refany/lcs.csproj +++ b/tests/src/JIT/Methodical/refany/lcs.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/native.csproj b/tests/src/JIT/Methodical/refany/native.csproj index db30722d0569..a100b56c0d09 100644 --- a/tests/src/JIT/Methodical/refany/native.csproj +++ b/tests/src/JIT/Methodical/refany/native.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/refany/virtcall.csproj b/tests/src/JIT/Methodical/refany/virtcall.csproj index fecf6cc43e2e..1f7727308cec 100644 --- a/tests/src/JIT/Methodical/refany/virtcall.csproj +++ b/tests/src/JIT/Methodical/refany/virtcall.csproj @@ -29,9 +29,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj index 0225a059b738..b15027176fb3 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/xxobj/operand/_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj index faf18d60df67..10128517d2cd 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj index 82d5593bcd91..7ff0df328086 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj index f7e7aafbeb74..7089fece1029 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj index 8f35c4bb6541..fa8199743a35 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj @@ -28,9 +28,10 @@ - - - + + netcoreapp1.1 + 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/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj index 80afc6699acb..9d5cf5d0e651 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 174ee76e18ec..c42c73625c51 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 1594ae0a450f..e26289d3f434 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 70fdb06897f4..345ee3247795 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 bd1b084df50f..9eb733599ad3 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 10f39efd0853..28b1fa42a7e1 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 975bf96f921b..0d3d9d324a42 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 417f1c56319e..8971e8aa7826 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 6751cc249281..2b4d20a5c3da 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 1ab94d40c809..0a309d0b35e1 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 09454d92188d..2c43dba6cd5a 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 1213cae10a2c..a0978c2c6aca 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 a6f11c0f06bf..3fffb1b1b816 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 37fa54eda8ea..b674da90319c 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 ca2c52545800..147ae342a42e 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 27e3773834ac..9bc41d95aad2 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 d7b09af8603f..b63153a38811 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 90d780e25845..daf711df0703 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 e9f704cf6b9b..97909f61d0c1 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 02eaf525e9aa..c08f3ff96962 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 a4c3de567461..5db8e820ac64 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 8f72e1c87ee0..08dfa01a1a59 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 ffadd545956c..9c260fe83755 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 2619b38c0cf9..265b0992330b 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 cb1ed7b64865..3bbd8afc30c6 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 b368d85bdab6..9a3f88966094 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 6d58dc402ff3..05e511d32b3b 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 776afa72c03a..674e4f687a97 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 448892e8eba1..d5870cd24408 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 edbab6006b2b..85a1aea481d0 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 ff30f8ccf7ec..91763f28fa47 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 270e55060fbf..7aed6112040c 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 bcf7b40d723a..15e50078ac25 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 669a0efdd5ff..3ab835d461ff 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 666ba47ce2b7..76d2a5a39101 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 78573f88cc9f..4c73bd65646a 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 5622ad71d299..b8eb815e0664 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 63339c8903c3..76d7b9ded5e2 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 5228f957bafb..c2368e0d35ce 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 ea10a44d8383..66d9b4955079 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 f16d1d38b17d..87408cd0b44d 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 caa2de7720d1..a768a01d95e3 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 9d253e28b47d..770b495ac58a 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 a234c093527e..a18aa8811a94 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 3cbf95283355..d10772f2af2c 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 true @@ -32,11 +33,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj index a7c8f2daf330..3dffd5e4bf55 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 true @@ -32,11 +33,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj index 259d5e8ff32c..5d5c7f72c6df 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 8d77905de9bc..30c542ee2777 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 097a3a25341b..89c8ad5c47ea 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -39,11 +40,9 @@ Always - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json \ 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 f8c3785f54bc..be7e66e2a3ef 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 7396e3b00f3c..003871e447fd 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 6f334e9afb92..e7b9d42bd0be 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -39,11 +40,9 @@ Always - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj index 69d39df429f0..00789ed3a576 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -39,11 +40,9 @@ Always - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj index e12feab89a35..3cbd6d32db6a 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 0f57308962d9..bb0aca7f14ef 100644 --- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 26a64c6e89b0..a293c239873f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 true @@ -45,10 +46,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 af7ce3b4c97f..7bac1f4bdf5d 100644 --- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj +++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 7ecdbab687f0..7d26fcb734ee 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj @@ -30,11 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj index 34b42c389fc2..965618d15d16 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -31,11 +32,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj index 2fc6cb0419c1..6fac3b034a49 100644 --- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 2545a585bbfd..067ea9f7e0dc 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETCoreApp,Version=v1.1 + netcoreapp1.1 @@ -73,4 +74,4 @@ - + \ 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 baea313f2c00..bb5226e58ceb 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 true @@ -30,10 +31,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark+roslyn\project.json - $(JitPackagesConfigFileDirectory)benchmark+roslyn\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark+roslyn\obj\project.assets.json + \ 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 b6224770fa65..dc256858fa36 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -38,10 +39,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 0b1e5be0ae63..ea19938bd5fd 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -44,10 +45,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 d5c72559ec61..dc31f186a260 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 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj index 917d749d41c5..65726fce8531 100644 --- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 SciMark @@ -39,10 +40,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 c08d1cd14b1e..e28565bb52aa 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark+serialize\project.json - $(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json + \ 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 04798526f92b..235de7646377 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj @@ -10,6 +10,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark+serialize\project.json - $(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json + \ 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 a871713d1d67..0427657cf5a3 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -12,6 +12,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -34,11 +35,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj index 7404828bcd8b..f3bcfa2ed99c 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -12,6 +12,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -33,11 +34,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj index ec9e4e1bbf79..ff54fab73323 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 f81039d69345..50c842069180 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 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ .NETStandard,Version=v1.4 + netstandard1.4 @@ -29,10 +30,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 0489b0a8b08a..6932f71caec6 100644 --- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj +++ b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj @@ -28,10 +28,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 46b4b8e24f59..949136259ba8 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 @@ - - - + + netcoreapp1.1 + 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/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 fb24d7810704..bb1bf4d139cd 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 @@ - - - + + netcoreapp1.1 + 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/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 2358d4970fcc..68a40de4bdf9 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 @@ - - - + + netcoreapp1.1 + 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/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 26cd0e80c341..509a6628ea0f 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 @@ - - - + + netcoreapp1.1 + 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/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 3c046ea75461..99cdb6ebbb2a 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 @@ - - - + + netcoreapp1.1 + 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/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 9acb19163a88..3bd0fa0fa738 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 @@ - - - + + netcoreapp1.1 + 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/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 1067ba1e429a..390448cfd321 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 @@ - - - + + netcoreapp1.1 + 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/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj index 2d330449a1b4..d6d753abaa4b 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 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json 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 1d20f0001241..1b7f8a70b51e 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 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json 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 6107b7f18d5c..7bdd3d723833 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 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json + \ 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 238a9b609ada..db2490dda964 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 @@ - - - + + netcoreapp1.1 + 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/JIT/RyuJIT/DoWhileBndChk.csproj b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj index 30b8c4b97ecd..a3fbd8a94845 100644 --- a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj +++ b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj @@ -20,9 +20,10 @@ - - - + + netcoreapp1.1 + 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/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj new file mode 100644 index 000000000000..0f2937aac418 --- /dev/null +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -0,0 +1,98 @@ + + + + + .NETStandard,Version=v1.4 + netstandard1.4 + + + + 1.1.1 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.3-alpha-experimental + + + 2.0.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + $(XunitPackageVersion) + + + 1.0.2-prerelease-00177 + + + $(XunitPackageVersion) + + + + netstandard1.4 + .NETStandard + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + true + false + + + + \ 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 d7855528207f..000000000000 --- 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 000000000000..c0cb32f1196c --- /dev/null +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -0,0 +1,98 @@ + + + + + .NETStandard,Version=v1.4 + netstandard1.4 + + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.3-alpha-experimental + + + 2.0.0-preview2-25302-03 + + + 7.0.1 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + $(XunitPackageVersion) + + + 1.0.2-prerelease-00177 + + + $(XunitPackageVersion) + + + + netstandard1.4 + .NETStandard + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + true + false + + + + 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 402884f56cc3..000000000000 --- 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 000000000000..c7a5d57116c6 --- /dev/null +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -0,0 +1,113 @@ + + + + + .NETStandard,Version=v1.4 + netstandard1.4 + + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.3-alpha-experimental + + + 2.0.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + $(XunitPackageVersion) + + + 1.0.2-prerelease-00177 + + + $(XunitPackageVersion) + + + + netstandard1.4 + .NETStandard + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + true + false + + + + \ 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 46b9a694e590..000000000000 --- 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 f71ad15a0593..8be1cb04bf72 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 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json \ 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 0bfc25ff45ca..75da709ced8b 100644 --- a/tests/src/JIT/opt/Devirtualization/override.ilproj +++ b/tests/src/JIT/opt/Devirtualization/override.ilproj @@ -32,11 +32,9 @@ - - $(JitPackagesConfigFileDirectory)benchmark\project.json - $(JitPackagesConfigFileDirectory)benchmark\project.lock.json - - + + + $(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json \ 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 000000000000..80f52a02598f --- /dev/null +++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj @@ -0,0 +1,37 @@ + + + + + Debug + AnyCPU + BuildOnly + + + + 2.0.0-$(CoreFxExpectedPrerelease) + + + $(XunitPackageVersion) + + + $(XunitPackageVersion) + + + $(XunitPackageVersion) + + + $(XunitPackageVersion) + + + + netcoreapp1.1;net45 + .NETCoreApp + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 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 + true + false + + + + \ 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 975651896a29..000000000000 --- 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 cb976cc081f7..abad765fe49a 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -13,6 +13,7 @@ true $(MSBuildThisFileDirectory)TestWrappersConfig\ + Test @@ -75,16 +76,22 @@ true + + + true + + 2 - $(SourceDir)Common\test_dependencies\project.json - $(SourceDir)Common\test_dependencies\project.lock.json + $(MSBuildProjectDirectory)\obj .NETCoreApp,Version=v2.0 + netcoreapp2.0 + true diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 08c77df7cf8f..4e6c61802131 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -50,11 +50,6 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true - - $(SourceDir)Common/empty/project.json - $(SourceDir)Common/empty/project.lock.json - - @@ -189,4 +184,13 @@ DestinationFolder="$(OutputPath)" Condition="Exists('$(AssemblyName).reflect.xml')"/> + + + $(SourceDir)Common\test_dependencies\obj\project.assets.json + + + + + + diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj index e49ab945a776..6ae2b7c09e9e 100644 --- a/tests/src/dirs.proj +++ b/tests/src/dirs.proj @@ -23,9 +23,11 @@ - + + + diff --git a/tests/src/performance/linkbench/linkbench.csproj b/tests/src/performance/linkbench/linkbench.csproj index 2a3048ab2104..46c79ff03991 100644 --- a/tests/src/performance/linkbench/linkbench.csproj +++ b/tests/src/performance/linkbench/linkbench.csproj @@ -16,6 +16,7 @@ 7a9bfb7d $(DefineConstants);STATIC .NETStandard,Version=v1.4 + netstandard1.4 @@ -23,8 +24,7 @@ - ..\project.json - ..\project.lock.json + ..\obj diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj index ed197261fb11..ccacb0b66c21 100644 --- a/tests/src/performance/perflab/PerfLab.csproj +++ b/tests/src/performance/perflab/PerfLab.csproj @@ -12,6 +12,7 @@ ..\..\ $(DefineConstants);STATIC .NETStandard,Version=v1.4 + netstandard1.4 @@ -19,8 +20,7 @@ - ..\project.json - ..\project.lock.json + ..\obj diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj new file mode 100644 index 000000000000..49659691bf67 --- /dev/null +++ b/tests/src/performance/performance.csproj @@ -0,0 +1,110 @@ + + + + + .NETStandard,Version=v1.5 + netstandard1.5 + + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.0-beta-build0003 + + + 1.0.3-alpha-experimental + + + 2.0.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-preview2-25302-03 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.0.0 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + 4.4.0-beta-24913-02 + + + $(XunitPackageVersion) + + + 1.0.2-prerelease-00177 + + + $(XunitPackageVersion) + + + + netstandard1.5 + .NETStandard + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + true + false + + + + diff --git a/tests/src/performance/project.json b/tests/src/performance/project.json deleted file mode 100644 index 8746053f7eb8..000000000000 --- 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" - ] - } - } -} diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index 3b59343f8aca..69531f44b1ee 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -77,3 +77,6 @@ Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generate Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/Generated681.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/Generated682.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/Generated683.sh +Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass/Test6_ImplementingClass.sh"> +Loader/classloader/regressions/440935/Test/Test.sh"> +JIT/CheckProjects/CheckProjects/CheckProjects.sh diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets index 3b343bd89119..a0ff7f59fa2d 100644 --- a/tests/xunitwrapper.targets +++ b/tests/xunitwrapper.targets @@ -6,13 +6,13 @@ -