diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 0e2159fd3c25..4a00c1786bee 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -40,17 +40,22 @@ + + $(DefaultNetCoreTargetFramework) + netcoreapp5.0 + + - + diff --git a/global.json b/global.json index dee19df73dff..ce64ce891e29 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,8 @@ { "sdk": { - "version": "5.0.100-preview.5.20251.2" + "version": "5.0.100-preview.5.20251.2", + "allowPrerelease": true, + "rollForward": "major" }, "tools": { "dotnet": "5.0.100-preview.5.20251.2", @@ -15,7 +17,7 @@ "Git": "2.22.0", "jdk": "11.0.3", "vs": { - "version": "16.3", + "version": "16.5", "components": [ "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", diff --git a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/template.json b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/template.json index e49f99528931..29d5eef17448 100644 --- a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/template.json @@ -85,12 +85,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Directory.Build.props b/src/ProjectTemplates/Directory.Build.props index c97ca68bd06c..8b6266a4ff74 100644 --- a/src/ProjectTemplates/Directory.Build.props +++ b/src/ProjectTemplates/Directory.Build.props @@ -2,6 +2,9 @@ + + net5.0 + false false diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json index 66bfdc777bb2..484e81863cd8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json @@ -337,12 +337,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json index caf1ab80e607..9964a3ae5a5a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json @@ -86,12 +86,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json index df7b62a1697b..9f436eba9c3e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json @@ -82,12 +82,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json index 0ca933164a50..7c9acda73b39 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json @@ -41,11 +41,11 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "defaultValue": "netcoreapp5.0" + "defaultValue": "net5.0" }, "ExcludeLaunchSettings": { "type": "parameter", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json index 543e0bdd5dd9..5a6a957a2ca7 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json @@ -47,11 +47,11 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "defaultValue": "netcoreapp5.0" + "defaultValue": "net5.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 81aacfa7e7b4..a98d4dcf6c56 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -316,12 +316,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index d846394fa943..9fabeb1cc414 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -306,12 +306,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json index 779cf7d82c17..6988370f4eb2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json @@ -87,12 +87,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json index 9c560017be7a..731fcbcb0fa7 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json @@ -209,12 +209,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index b3f4e81300f7..d9d9cf819322 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -82,12 +82,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json index fa3775c56451..fdffe3815f25 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json @@ -47,12 +47,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json index fb376267c2c8..1a26e86718a6 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json @@ -177,12 +177,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json index 4b2e6ad78671..24854b9c5631 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json @@ -178,12 +178,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json index f32b4adac42d..935a599725d4 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json @@ -87,12 +87,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp5.0", - "description": "Target netcoreapp5.0" + "choice": "net5.0", + "description": "Target net5.0" } ], - "replaces": "netcoreapp5.0", - "defaultValue": "netcoreapp5.0" + "replaces": "net5.0", + "defaultValue": "net5.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/build.cmd b/src/ProjectTemplates/build.cmd index b5aa28c66337..7010509e0ad3 100644 --- a/src/ProjectTemplates/build.cmd +++ b/src/ProjectTemplates/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0*\*.*proj "/p:EnforceE2ETestPrerequisites=true" %* +%RepoRoot%\build.cmd -projects %~dp0*\*.*proj -ForceCoreMsbuild "/p:EnforceE2ETestPrerequisites=true" %*