From 8ef60014abc623fcd3479537fb0b3c1607035b28 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 2 Dec 2019 18:21:51 +0100 Subject: [PATCH 01/10] Upgrade global.json to 5.0-alpha1 SDK --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index a288d7c80c17f1..67ab5a86f48f28 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "3.0.100", + "version": "5.0.100-alpha1-015772", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "3.0.100" + "dotnet": "5.0.100-alpha1-015772" }, "native-tools": { "cmake": "3.14.2", From a1aef8ed98a4c082a7b28cd5dfd553b53ff21abe Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 2 Dec 2019 21:05:02 +0100 Subject: [PATCH 02/10] Introduce a vNext NetCoreApp TFM --- Directory.Build.props | 8 ++++++-- eng/configurations/targetgroups.props | 4 ++-- .../Microsoft.NETCore.Crossgen2.pkgproj | 4 ++-- src/coreclr/src/.nuget/optdata/optdata.csproj | 2 +- .../Tools/GenUnicodeProp/GenUnicodeProp.csproj | 2 +- .../JitInterface/ThunkGenerator/ThunkGenerator.csproj | 2 +- .../ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs | 2 +- .../tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj | 2 +- .../ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj | 2 +- .../src/tools/crossgen2/crossgen2/crossgen2.csproj | 2 +- src/coreclr/src/tools/r2rdump/R2RDump.csproj | 2 +- src/coreclr/src/tools/runincontext/runincontext.csproj | 2 +- src/coreclr/tests/dir.sdkbuild.props | 2 +- src/coreclr/tests/external/external.csproj | 6 +++--- .../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj | 6 +----- .../Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj | 4 ++-- .../src/Common/test_dependencies/test_dependencies.csproj | 3 +-- .../tests/src/Common/test_runtime/test_runtime.csproj | 3 +-- src/coreclr/tests/src/Directory.Build.props | 4 ++-- .../Scenario/JitBench/Utilities/DotNetSetup.cs | 6 +++++- src/installer/pkg/Directory.Build.props | 2 +- src/installer/test/Directory.Build.props | 2 +- .../tests/Directory.Build.props | 2 +- tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj | 2 +- 24 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 867d863b83afff..3f50d05715f6e5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,8 +18,6 @@ --> - - $(MSBuildThisFileDirectory) @@ -28,6 +26,12 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin')) + + + .NETCoreApp,Version=v5.0 + netcoreapp5.0 + + - netcoreapp5.0 - netcoreapp5.0 + $(NetCoreAppvNextTFM) + $(NetCoreAppvNextTFM) netstandard2.1 diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj index bd4cc28d8e1e6c..ad0230f450878c 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj @@ -19,10 +19,10 @@ { "runtimeOptions": { - "tfm": "netcoreapp3.0", + "tfm": "netcoreapp5.0", "framework": { "name": "Microsoft.NETCore.App", - "version": "5.0.0-alpha1.0" + "version": "5.0.100-alpha1-015772" } } } diff --git a/src/coreclr/src/.nuget/optdata/optdata.csproj b/src/coreclr/src/.nuget/optdata/optdata.csproj index fec54df25b0f96..d0264ebf046654 100644 --- a/src/coreclr/src/.nuget/optdata/optdata.csproj +++ b/src/coreclr/src/.nuget/optdata/optdata.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + $(NetCoreAppvNextTFM) true True True diff --git a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj index 5635c9dce4fb09..628c3efac6ffda 100644 --- a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj +++ b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.0 + $(NetCoreAppvNextTFM) diff --git a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj index 958d2f1daae335..86dbfc53d1c357 100644 --- a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj +++ b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.0 + $(NetCoreAppvNextTFM) diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs b/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs index 9a477c1f7b8f87..9efc474dc63ee5 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs @@ -81,7 +81,7 @@ public static int CompileNuget(BuildOptions options) } // This is not a reliable way of building the publish folder - string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\netcoreapp3.0\publish"); + string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\netcoreapp5.0\publish"); if (!Directory.Exists(publishFolder)) { nugetLog.WriteLine($"Could not find folder {publishFolder} containing the published app."); diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj index b151a2b359e078..a7f9069afc8133 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj @@ -3,7 +3,7 @@ ReadyToRun.SuperIlc true Exe - netcoreapp3.0 + $(NetCoreAppvNextTFM) 8002,NU1701 AnyCPU $(BinDir)\ReadyToRun.SuperIlc diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 338cf173b9faba..697e0c1c40f77e 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -2,7 +2,7 @@ Library ILCompiler.ReadyToRun - netcoreapp3.0 + $(NetCoreAppvNextTFM) true READYTORUN;$(DefineConstants) false diff --git a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj index d5a13cb13cfe0d..15faf5d86c5377 100644 --- a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj @@ -3,7 +3,7 @@ crossgen2 true Exe - netcoreapp3.0 + $(NetCoreAppvNextTFM) 8002,NU1701 x64;x86 $(BuildArch) diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj index 28645dcc7164a8..154d1a76a40ed8 100644 --- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj @@ -7,7 +7,7 @@ AnyCPU Open true - netcoreapp3.0 + $(NetCoreAppvNextTFM) false 8002,NU1701 win-x64;win-x86 diff --git a/src/coreclr/src/tools/runincontext/runincontext.csproj b/src/coreclr/src/tools/runincontext/runincontext.csproj index 0a6f6aac1def56..64ec0f1f2a7064 100644 --- a/src/coreclr/src/tools/runincontext/runincontext.csproj +++ b/src/coreclr/src/tools/runincontext/runincontext.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.0 + $(NetCoreAppvNextTFM) $(MicrosoftNETCoreAppVersion) false BuildOnly diff --git a/src/coreclr/tests/dir.sdkbuild.props b/src/coreclr/tests/dir.sdkbuild.props index 65eaa737581608..252416947d9c0a 100644 --- a/src/coreclr/tests/dir.sdkbuild.props +++ b/src/coreclr/tests/dir.sdkbuild.props @@ -6,7 +6,7 @@ and old-style projects should go in dir.common.props. --> - netcoreapp3.0 + $(NetCoreAppvNextTFM) false false $(BuildArch) diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj index 361b1c57fa87d6..3f8f655eccfaf2 100644 --- a/src/coreclr/tests/external/external.csproj +++ b/src/coreclr/tests/external/external.csproj @@ -12,9 +12,9 @@ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> $(TargetingPackPath) - netcoreapp3.0 - .NETCoreApp,Version=v3.0 - netcoreapp3.0 + $(NetCoreAppvNextTFM) + $(NetCoreAppvNextTFMFull) + $(NetCoreAppvNextTFM) win7-x86;win7-x64 netcoreapp2.1 SharedLibrary diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index 88084011557705..208014d8fa6f43 100644 --- a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj +++ b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj @@ -7,11 +7,7 @@ $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) true false - - netcoreapp5.0 + $(NetCoreAppvNextTFM) $(SourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json diff --git a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj index 8764d8c6dcaa8d..d17182e0253613 100644 --- a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj +++ b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj @@ -3,8 +3,8 @@ true $(SourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json - .NETCoreApp,Version=v3.0 - netcoreapp3.0 + $(NetCoreAppvNextTFMFull) + $(NetCoreAppvNextTFM) diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj index af83abd53df7b5..7bcf88cb76d53f 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -2,8 +2,7 @@ BuildOnly false - netcoreapp3.0 - netcoreapp5.0 + $(NetCoreAppvNextTFM) true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj index dbf6db252a49d7..88017e50ab52f7 100644 --- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj +++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj @@ -2,8 +2,7 @@ BuildOnly false - netcoreapp3.0 - netcoreapp5.0 + $(NetCoreAppvNextTFM) win-arm;win-arm64;win-x64;win-x86;$(TargetRid) $(AssetTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8 $(NoWarn);NU1603 diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 3a6176fa1737bd..ec1b08c0215395 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -142,7 +142,7 @@ $(MSBuildProjectDirectory)\obj - .NETCoreApp,Version=v5.0 - netcoreapp5.0 + $(NetCoreAppvNextTFMFull) + $(NetCoreAppvNextTFM) diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/Utilities/DotNetSetup.cs b/src/coreclr/tests/src/performance/Scenario/JitBench/Utilities/DotNetSetup.cs index 7154ab4b13245a..04302fc9368081 100644 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/Utilities/DotNetSetup.cs +++ b/src/coreclr/tests/src/performance/Scenario/JitBench/Utilities/DotNetSetup.cs @@ -235,7 +235,11 @@ public static string GetSDKDownloadLink(string azureFeed, string version, string public static string GetTargetFrameworkMonikerForFrameworkVersion(string runtimeVersion) { - if (runtimeVersion.StartsWith("3.0")) + if (runtimeVersion.StartsWith("5.0")) + { + return "netcoreapp5.0"; + } + else if (runtimeVersion.StartsWith("3.0")) { return "netcoreapp3.0"; } diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props index 0d329989b033f0..c81a6858780f1d 100644 --- a/src/installer/pkg/Directory.Build.props +++ b/src/installer/pkg/Directory.Build.props @@ -33,7 +33,7 @@ deb-tool" commands, after depending on InitializeDotnetDebTool target. --> $(ArtifactsBinDir)dotnet-deb-tool\ - $(DebToolBinDir)$(Configuration)\netcoreapp3.0\dotnet-deb-tool.dll + $(DebToolBinDir)$(Configuration)\$(NetCoreAppvNextTFM)\dotnet-deb-tool.dll $(RepoRoot)tools-local/dotnet-deb-tool/ $(ArtifactsObjDir)TestNuGetConfig\NuGet.config $(ArtifactsObjDir)ExtraNupkgsForTestRestore\ $(TargetArchitecture) - netcoreapp3.0 + $(NetCoreAppvNextTFM) diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props index 44c46b2869e7a5..108c615b1641ae 100644 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props +++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props @@ -8,6 +8,6 @@ 99.9 Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RuntimeIdentifiers).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages) true - netcoreapp3.0 + $(NetCoreAppvNextTFM) \ No newline at end of file diff --git a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj index 4f2d67d81e46e9..aa14090e06bd77 100644 --- a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj +++ b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + $(NetCoreAppvNextTFM) dotnet-deb-tool Exe From 86569835fb62f100a5db4a07a5f5733a1cf2748a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Dec 2019 00:17:33 +0100 Subject: [PATCH 03/10] Update tfm props names --- Directory.Build.props | 4 ++-- eng/configurations/targetgroups.props | 4 ++-- src/coreclr/src/.nuget/optdata/optdata.csproj | 2 +- .../Tools/GenUnicodeProp/GenUnicodeProp.csproj | 2 +- .../JitInterface/ThunkGenerator/ThunkGenerator.csproj | 2 +- .../tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj | 2 +- .../ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj | 2 +- src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj | 2 +- src/coreclr/src/tools/r2rdump/R2RDump.csproj | 2 +- src/coreclr/src/tools/runincontext/runincontext.csproj | 2 +- src/coreclr/tests/dir.sdkbuild.props | 2 +- src/coreclr/tests/external/external.csproj | 6 +++--- .../src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj | 2 +- .../Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj | 4 ++-- .../src/Common/test_dependencies/test_dependencies.csproj | 2 +- .../tests/src/Common/test_runtime/test_runtime.csproj | 2 +- src/coreclr/tests/src/Directory.Build.props | 4 ++-- src/installer/pkg/Directory.Build.props | 2 +- src/installer/test/Directory.Build.props | 2 +- .../tests/Directory.Build.props | 2 +- tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3f50d05715f6e5..d177312dcd2499 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,8 +28,8 @@ - .NETCoreApp,Version=v5.0 - netcoreapp5.0 + .NETCoreApp,Version=v5.0 + netcoreapp5.0 - $(NetCoreAppvNextTFM) - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrentTFM) netstandard2.1 diff --git a/src/coreclr/src/.nuget/optdata/optdata.csproj b/src/coreclr/src/.nuget/optdata/optdata.csproj index d0264ebf046654..fe19568aa49f58 100644 --- a/src/coreclr/src/.nuget/optdata/optdata.csproj +++ b/src/coreclr/src/.nuget/optdata/optdata.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) true True True diff --git a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj index 628c3efac6ffda..1bc761ef2ad52b 100644 --- a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj +++ b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj @@ -2,7 +2,7 @@ Exe - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) diff --git a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj index 86dbfc53d1c357..de509fff80b829 100644 --- a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj +++ b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj @@ -2,7 +2,7 @@ Exe - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj index a7f9069afc8133..e34ee20c4d6deb 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj @@ -3,7 +3,7 @@ ReadyToRun.SuperIlc true Exe - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) 8002,NU1701 AnyCPU $(BinDir)\ReadyToRun.SuperIlc diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 697e0c1c40f77e..279915d8242548 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -2,7 +2,7 @@ Library ILCompiler.ReadyToRun - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) true READYTORUN;$(DefineConstants) false diff --git a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj index 15faf5d86c5377..47c4bcdeda8387 100644 --- a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj @@ -3,7 +3,7 @@ crossgen2 true Exe - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) 8002,NU1701 x64;x86 $(BuildArch) diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj index 154d1a76a40ed8..e4b09baf4120da 100644 --- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj @@ -7,7 +7,7 @@ AnyCPU Open true - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) false 8002,NU1701 win-x64;win-x86 diff --git a/src/coreclr/src/tools/runincontext/runincontext.csproj b/src/coreclr/src/tools/runincontext/runincontext.csproj index 64ec0f1f2a7064..7729b38cb04e47 100644 --- a/src/coreclr/src/tools/runincontext/runincontext.csproj +++ b/src/coreclr/src/tools/runincontext/runincontext.csproj @@ -1,7 +1,7 @@ Exe - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) $(MicrosoftNETCoreAppVersion) false BuildOnly diff --git a/src/coreclr/tests/dir.sdkbuild.props b/src/coreclr/tests/dir.sdkbuild.props index 252416947d9c0a..475534627e62c8 100644 --- a/src/coreclr/tests/dir.sdkbuild.props +++ b/src/coreclr/tests/dir.sdkbuild.props @@ -6,7 +6,7 @@ and old-style projects should go in dir.common.props. --> - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) false false $(BuildArch) diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj index 3f8f655eccfaf2..2347bccabb8b04 100644 --- a/src/coreclr/tests/external/external.csproj +++ b/src/coreclr/tests/external/external.csproj @@ -12,9 +12,9 @@ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> $(TargetingPackPath) - $(NetCoreAppvNextTFM) - $(NetCoreAppvNextTFMFull) - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrentTFMFull) + $(NetCoreAppCurrentTFM) win7-x86;win7-x64 netcoreapp2.1 SharedLibrary diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index 208014d8fa6f43..3655931e23012a 100644 --- a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj +++ b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj @@ -7,7 +7,7 @@ $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) true false - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) $(SourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json diff --git a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj index d17182e0253613..cd7eca0549bf87 100644 --- a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj +++ b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj @@ -3,8 +3,8 @@ true $(SourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json - $(NetCoreAppvNextTFMFull) - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFMFull) + $(NetCoreAppCurrentTFM) diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj index 7bcf88cb76d53f..cf061f0ea6cd8b 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -2,7 +2,7 @@ BuildOnly false - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj index 88017e50ab52f7..b98c8e7a6b38be 100644 --- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj +++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj @@ -2,7 +2,7 @@ BuildOnly false - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) win-arm;win-arm64;win-x64;win-x86;$(TargetRid) $(AssetTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8 $(NoWarn);NU1603 diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index ec1b08c0215395..1ffe6162df140a 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -142,7 +142,7 @@ $(MSBuildProjectDirectory)\obj - $(NetCoreAppvNextTFMFull) - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFMFull) + $(NetCoreAppCurrentTFM) diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props index c81a6858780f1d..3201a504da1f24 100644 --- a/src/installer/pkg/Directory.Build.props +++ b/src/installer/pkg/Directory.Build.props @@ -33,7 +33,7 @@ deb-tool" commands, after depending on InitializeDotnetDebTool target. --> $(ArtifactsBinDir)dotnet-deb-tool\ - $(DebToolBinDir)$(Configuration)\$(NetCoreAppvNextTFM)\dotnet-deb-tool.dll + $(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrentTFM)\dotnet-deb-tool.dll $(RepoRoot)tools-local/dotnet-deb-tool/ $(ArtifactsObjDir)TestNuGetConfig\NuGet.config $(ArtifactsObjDir)ExtraNupkgsForTestRestore\ $(TargetArchitecture) - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props index 108c615b1641ae..699c4f7f961449 100644 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props +++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props @@ -8,6 +8,6 @@ 99.9 Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RuntimeIdentifiers).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages) true - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) \ No newline at end of file diff --git a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj index aa14090e06bd77..b9790311f5009f 100644 --- a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj +++ b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppvNextTFM) + $(NetCoreAppCurrentTFM) dotnet-deb-tool Exe From 15343f69c922bd76beb1a06bf82d3e5acc2bb32e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 4 Dec 2019 16:22:04 +0100 Subject: [PATCH 04/10] React to naming suggestion --- Directory.Build.props | 4 ++-- eng/configurations/targetgroups.props | 4 ++-- src/coreclr/src/.nuget/optdata/optdata.csproj | 2 +- .../Tools/GenUnicodeProp/GenUnicodeProp.csproj | 2 +- .../JitInterface/ThunkGenerator/ThunkGenerator.csproj | 2 +- .../tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj | 2 +- .../ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj | 2 +- src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj | 2 +- src/coreclr/src/tools/r2rdump/R2RDump.csproj | 2 +- src/coreclr/src/tools/runincontext/runincontext.csproj | 2 +- src/coreclr/tests/dir.sdkbuild.props | 2 +- src/coreclr/tests/external/external.csproj | 6 +++--- .../src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj | 2 +- .../Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj | 4 ++-- .../src/Common/test_dependencies/test_dependencies.csproj | 2 +- .../tests/src/Common/test_runtime/test_runtime.csproj | 2 +- src/coreclr/tests/src/Directory.Build.props | 4 ++-- src/installer/pkg/Directory.Build.props | 2 +- src/installer/test/Directory.Build.props | 2 +- .../tests/Directory.Build.props | 2 +- tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d177312dcd2499..ca3e02475e2b7f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,8 +28,8 @@ - .NETCoreApp,Version=v5.0 - netcoreapp5.0 + .NETCoreApp,Version=v5.0 + netcoreapp5.0 - $(NetCoreAppCurrentTFM) - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) + $(NetCoreAppCurrent) netstandard2.1 diff --git a/src/coreclr/src/.nuget/optdata/optdata.csproj b/src/coreclr/src/.nuget/optdata/optdata.csproj index fe19568aa49f58..05960492d14dca 100644 --- a/src/coreclr/src/.nuget/optdata/optdata.csproj +++ b/src/coreclr/src/.nuget/optdata/optdata.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) true True True diff --git a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj index 1bc761ef2ad52b..b4c010bfc67b6d 100644 --- a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj +++ b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj @@ -2,7 +2,7 @@ Exe - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) diff --git a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj index de509fff80b829..06ad79da63cc54 100644 --- a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj +++ b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj @@ -2,7 +2,7 @@ Exe - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj index e34ee20c4d6deb..3cf0cbfe0848ee 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj @@ -3,7 +3,7 @@ ReadyToRun.SuperIlc true Exe - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) 8002,NU1701 AnyCPU $(BinDir)\ReadyToRun.SuperIlc diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 279915d8242548..e3dc42807ec9a5 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -2,7 +2,7 @@ Library ILCompiler.ReadyToRun - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) true READYTORUN;$(DefineConstants) false diff --git a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj index 47c4bcdeda8387..d2a4d51051d8c6 100644 --- a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj @@ -3,7 +3,7 @@ crossgen2 true Exe - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) 8002,NU1701 x64;x86 $(BuildArch) diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj index e4b09baf4120da..74e7908e22fd9e 100644 --- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj @@ -7,7 +7,7 @@ AnyCPU Open true - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) false 8002,NU1701 win-x64;win-x86 diff --git a/src/coreclr/src/tools/runincontext/runincontext.csproj b/src/coreclr/src/tools/runincontext/runincontext.csproj index 7729b38cb04e47..1005cdf7417230 100644 --- a/src/coreclr/src/tools/runincontext/runincontext.csproj +++ b/src/coreclr/src/tools/runincontext/runincontext.csproj @@ -1,7 +1,7 @@ Exe - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) $(MicrosoftNETCoreAppVersion) false BuildOnly diff --git a/src/coreclr/tests/dir.sdkbuild.props b/src/coreclr/tests/dir.sdkbuild.props index 475534627e62c8..5a6d532c1f0981 100644 --- a/src/coreclr/tests/dir.sdkbuild.props +++ b/src/coreclr/tests/dir.sdkbuild.props @@ -6,7 +6,7 @@ and old-style projects should go in dir.common.props. --> - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) false false $(BuildArch) diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj index 2347bccabb8b04..13383f9a73f31a 100644 --- a/src/coreclr/tests/external/external.csproj +++ b/src/coreclr/tests/external/external.csproj @@ -12,9 +12,9 @@ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> $(TargetingPackPath) - $(NetCoreAppCurrentTFM) - $(NetCoreAppCurrentTFMFull) - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) + $(NetCoreAppCurrentTargetFrameworkMoniker) + $(NetCoreAppCurrent) win7-x86;win7-x64 netcoreapp2.1 SharedLibrary diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index 3655931e23012a..453a5c3451c1aa 100644 --- a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj +++ b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj @@ -7,7 +7,7 @@ $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) true false - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) $(SourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json diff --git a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj index cd7eca0549bf87..45cb39f8dd02af 100644 --- a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj +++ b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj @@ -3,8 +3,8 @@ true $(SourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json - $(NetCoreAppCurrentTFMFull) - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrentTargetFrameworkMoniker) + $(NetCoreAppCurrent) diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj index cf061f0ea6cd8b..f3caa0e8ec5b01 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -2,7 +2,7 @@ BuildOnly false - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj index b98c8e7a6b38be..a09ddaae79f58b 100644 --- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj +++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj @@ -2,7 +2,7 @@ BuildOnly false - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) win-arm;win-arm64;win-x64;win-x86;$(TargetRid) $(AssetTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8 $(NoWarn);NU1603 diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 1ffe6162df140a..0a0750801b36af 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -142,7 +142,7 @@ $(MSBuildProjectDirectory)\obj - $(NetCoreAppCurrentTFMFull) - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrentTargetFrameworkMoniker) + $(NetCoreAppCurrent) diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props index 3201a504da1f24..74c9b9b9b4f566 100644 --- a/src/installer/pkg/Directory.Build.props +++ b/src/installer/pkg/Directory.Build.props @@ -33,7 +33,7 @@ deb-tool" commands, after depending on InitializeDotnetDebTool target. --> $(ArtifactsBinDir)dotnet-deb-tool\ - $(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrentTFM)\dotnet-deb-tool.dll + $(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrent)\dotnet-deb-tool.dll $(RepoRoot)tools-local/dotnet-deb-tool/ $(ArtifactsObjDir)TestNuGetConfig\NuGet.config $(ArtifactsObjDir)ExtraNupkgsForTestRestore\ $(TargetArchitecture) - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props index 699c4f7f961449..29939afd03a27f 100644 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props +++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props @@ -8,6 +8,6 @@ 99.9 Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RuntimeIdentifiers).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages) true - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) \ No newline at end of file diff --git a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj index b9790311f5009f..cdbeffee0734fd 100644 --- a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj +++ b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrentTFM) + $(NetCoreAppCurrent) dotnet-deb-tool Exe From 70636c913d7e984d443fd139c4097dc241b78129 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 Dec 2019 11:02:23 +0100 Subject: [PATCH 05/10] Don't apply RuntimeFramework for depprojs --- eng/testing/runtimeConfiguration.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/runtimeConfiguration.targets b/eng/testing/runtimeConfiguration.targets index 6b6c952cb79d05..fdb81abbb18929 100644 --- a/eng/testing/runtimeConfiguration.targets +++ b/eng/testing/runtimeConfiguration.targets @@ -36,7 +36,7 @@ At that point restore and conflict resolution already happened therefore setting the item here has no side effects. --> From ea85fd3a14e53e4c8a890ed45c9dcaaef402b48d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 Dec 2019 11:03:08 +0100 Subject: [PATCH 06/10] Binplace framework refs for netcoreapp --- src/libraries/restore/netcoreapp/netcoreapp.depproj | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libraries/restore/netcoreapp/netcoreapp.depproj b/src/libraries/restore/netcoreapp/netcoreapp.depproj index af7d0259003d6f..b7c2e8aa279e57 100644 --- a/src/libraries/restore/netcoreapp/netcoreapp.depproj +++ b/src/libraries/restore/netcoreapp/netcoreapp.depproj @@ -11,6 +11,17 @@ + + + + <_referencePrivate Include="@(Reference)" Private="true" /> + + + + + From 81d8b94c838e77c4279fa3f5085aec79015dbc5e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 Dec 2019 11:03:24 +0100 Subject: [PATCH 07/10] Update pkg testing for netcoreapp5.0 sdk --- .../netcoreapp3.0/settings.targets | 3 -- .../netcoreapp5.0/settings.targets | 31 ++----------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets index 26049f49cd7a9a..1aa65488bec595 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets @@ -1,8 +1,5 @@ - - - diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets index 1598ff256fc7da..bc6aa5222f1057 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets @@ -1,35 +1,8 @@ - - netcoreapp5.0 - 5.0 - $(MicrosoftNETCoreAppVersion) - - false - - - - - - - + + \ No newline at end of file From 8678bcda94c99d888868221136709c6506285e19 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 Dec 2019 13:12:40 +0100 Subject: [PATCH 08/10] Bring CoreLib ignoreref for netcoreapp3.0 back --- .../pkg/test/frameworkSettings/netcoreapp3.0/settings.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets index 1aa65488bec595..26049f49cd7a9a 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets @@ -1,5 +1,8 @@ + + + From 0b0d86a3cc73a69f4bf24d48fbf3be6ae03eead9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 Dec 2019 14:46:02 +0100 Subject: [PATCH 09/10] Update another coreclr test dependency --- src/coreclr/tests/publishdependency.targets | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 6096501eb5a773..8c08ef3ea5ccd8 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -1,9 +1,7 @@ - - - + - - netcoreapp5.0 + + $(NetCoreAppCurrent) @@ -34,5 +32,4 @@ Properties="Language=C#;RuntimeIdentifier=$(TargetRid)" /> - From 4e4ada0ca7d34d5ce540d54cec65ef4067795415 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 Dec 2019 16:26:12 +0100 Subject: [PATCH 10/10] Downgrade the required sdk version --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 67ab5a86f48f28..46de1b594374b9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.100-alpha1-015772", + "version": "3.0.100", "allowPrerelease": true, "rollForward": "major" },