diff --git a/Directory.Build.props b/Directory.Build.props index 867d863b83afff..ca3e02475e2b7f 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 + $(NetCoreAppCurrent) + $(NetCoreAppCurrent) netstandard2.1 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. --> diff --git a/global.json b/global.json index a288d7c80c17f1..46de1b594374b9 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "rollForward": "major" }, "tools": { - "dotnet": "3.0.100" + "dotnet": "5.0.100-alpha1-015772" }, "native-tools": { "cmake": "3.14.2", 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..05960492d14dca 100644 --- a/src/coreclr/src/.nuget/optdata/optdata.csproj +++ b/src/coreclr/src/.nuget/optdata/optdata.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + $(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 5635c9dce4fb09..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 - netcoreapp3.0 + $(NetCoreAppCurrent) diff --git a/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj b/src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/ThunkGenerator.csproj index 958d2f1daae335..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 - netcoreapp3.0 + $(NetCoreAppCurrent) 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..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 - netcoreapp3.0 + $(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 338cf173b9faba..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 - netcoreapp3.0 + $(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 d5a13cb13cfe0d..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 - netcoreapp3.0 + $(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 28645dcc7164a8..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 - netcoreapp3.0 + $(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 0a6f6aac1def56..1005cdf7417230 100644 --- a/src/coreclr/src/tools/runincontext/runincontext.csproj +++ b/src/coreclr/src/tools/runincontext/runincontext.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.0 + $(NetCoreAppCurrent) $(MicrosoftNETCoreAppVersion) false BuildOnly diff --git a/src/coreclr/tests/dir.sdkbuild.props b/src/coreclr/tests/dir.sdkbuild.props index 65eaa737581608..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. --> - netcoreapp3.0 + $(NetCoreAppCurrent) false false $(BuildArch) diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj index 361b1c57fa87d6..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) - netcoreapp3.0 - .NETCoreApp,Version=v3.0 - netcoreapp3.0 + $(NetCoreAppCurrent) + $(NetCoreAppCurrentTargetFrameworkMoniker) + $(NetCoreAppCurrent) win7-x86;win7-x64 netcoreapp2.1 SharedLibrary 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)" /> - diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index 88084011557705..453a5c3451c1aa 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 + $(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 8764d8c6dcaa8d..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 - .NETCoreApp,Version=v3.0 - netcoreapp3.0 + $(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 af83abd53df7b5..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,8 +2,7 @@ BuildOnly false - netcoreapp3.0 - netcoreapp5.0 + $(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 dbf6db252a49d7..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,8 +2,7 @@ BuildOnly false - netcoreapp3.0 - netcoreapp5.0 + $(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 3a6176fa1737bd..0a0750801b36af 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 + $(NetCoreAppCurrentTargetFrameworkMoniker) + $(NetCoreAppCurrent) 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..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)\netcoreapp3.0\dotnet-deb-tool.dll + $(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrent)\dotnet-deb-tool.dll $(RepoRoot)tools-local/dotnet-deb-tool/ $(ArtifactsObjDir)TestNuGetConfig\NuGet.config $(ArtifactsObjDir)ExtraNupkgsForTestRestore\ $(TargetArchitecture) - netcoreapp3.0 + $(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 44c46b2869e7a5..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 - netcoreapp3.0 + $(NetCoreAppCurrent) \ No newline at end of file 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 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" /> + + + + + diff --git a/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj b/tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj index 4f2d67d81e46e9..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 @@  - netcoreapp3.0 + $(NetCoreAppCurrent) dotnet-deb-tool Exe