Skip to content

Commit 4fc8081

Browse files
wtgodbewtgodbe
authored
Update precedence of templates for 7.0 (#39783)
* Update submodule * Update precedence of templates for 7.0 * Update documentation
1 parent e15baf5 commit 4fc8081

File tree

15 files changed

+36
-32
lines changed

15 files changed

+36
-32
lines changed

‎docs/UpdatingMajorVersionAndTFM.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda
4444
2. Create a PR like [this one](https://github.com/dotnet/aspnetcore/pull/36932) updating the current release branch in `aspnetcore` to reference the new release branch you just created in dotnet/spa-templates.
4545
3. Create a PR like [this one](https://github.com/dotnet/spa-templates/pull/21) updating the branding & TFM in the `main` branch of dotnet/spa-templates.
4646
* Do not merge this until the PR from the previous step is merged.
47+
* Update template precedence
48+
1. Create & merge a PR like [this one](https://github.com/dotnet/spa-templates/pull/39) in dotnet/spa-templates updating `precedence` and `identity` elements in all template.json files.
49+
2. Create a PR like [this one](https://github.com/dotnet/aspnetcore/pull/39783) in dotnet/aspnetcore that updates the spa-templates submodule, and updates the `precedence`, `identity`, and (if it exists) `thirdPartyNotices` elements in all template.json files.
50+
3. Make sure the new aka.ms link you're referencing in `thirdPartyNotices` exists.
4751

4852
### Validation
4953

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"generatorVersions": "[1.0.0.0-*)",
1010
"description": "A project template for creating a Blazor server app that runs server-side inside an ASP.NET Core app and handles user interactions over a SignalR connection. This template can be used for web apps with rich dynamic user interfaces (UIs).",
1111
"groupIdentity": "Microsoft.Web.Blazor.Server",
12-
"precedence": "8000",
13-
"identity": "Microsoft.Web.Blazor.Server.CSharp.6.0",
12+
"precedence": "9000",
13+
"identity": "Microsoft.Web.Blazor.Server.CSharp.7.0",
1414
"shortName": "blazorserver",
15-
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
15+
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
1616
"tags": {
1717
"language": "C#",
1818
"type": "project"

‎src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"defaultName": "BlazorApp",
1212
"description": "A project template for creating a Blazor app that runs on WebAssembly and is optionally hosted by an ASP.NET Core app. This template can be used for web apps with rich dynamic user interfaces (UIs).",
1313
"groupIdentity": "Microsoft.Web.Blazor.Wasm",
14-
"precedence": "8000",
14+
"precedence": "9000",
1515
"guids": [
1616
"4C26868E-5E7C-458D-82E3-040509D0C71F",
1717
"5990939C-7E7B-4CFA-86FF-44CA5756498A",
@@ -20,8 +20,8 @@
2020
"09732173-2cef-46b7-83db-1334bcb079d3", // Tenant ID
2121
"53bc9b9d-9d6a-45d4-8429-2a2761773502" // Client ID
2222
],
23-
"identity": "Microsoft.Web.Blazor.Wasm.CSharp.6.0",
24-
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
23+
"identity": "Microsoft.Web.Blazor.Wasm.CSharp.7.0",
24+
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
2525
"preferNameDirectory": true,
2626
"primaryOutputs": [
2727
{

‎src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"generatorVersions": "[1.0.0.0-*)",
1010
"description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
1111
"groupIdentity": "Microsoft.Web.Empty",
12-
"precedence": "8000",
13-
"identity": "Microsoft.Web.Empty.CSharp.6.0",
12+
"precedence": "9000",
13+
"identity": "Microsoft.Web.Empty.CSharp.7.0",
1414
"shortName": "web",
1515
"tags": {
1616
"language": "C#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"generatorVersions": "[1.0.0.0-*)",
99
"description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
1010
"groupIdentity": "Microsoft.Web.Empty",
11-
"precedence": "8000",
12-
"identity": "Microsoft.Web.Empty.FSharp.6.0",
11+
"precedence": "9000",
12+
"identity": "Microsoft.Web.Empty.FSharp.7.0",
1313
"shortName": "web",
1414
"tags": {
1515
"language": "F#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"generatorVersions": "[1.0.0.0-*)",
1010
"description": "A project template for creating a gRPC ASP.NET Core service.",
1111
"groupIdentity": "Microsoft.Web.Grpc",
12-
"precedence": "8000",
13-
"identity": "Microsoft.Grpc.Service.CSharp.6.0",
12+
"precedence": "9000",
13+
"identity": "Microsoft.Grpc.Service.CSharp.7.0",
1414
"shortName": "grpc",
1515
"tags": {
1616
"language": "C#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"generatorVersions": "[1.0.0.0-*)",
1111
"description": "A project for creating a Razor class library that targets .NET Standard",
1212
"groupIdentity": "Microsoft.Web.Razor",
13-
"precedence": "8000",
14-
"identity": "Microsoft.Web.Razor.Library.CSharp.6.0",
13+
"precedence": "9000",
14+
"identity": "Microsoft.Web.Razor.Library.CSharp.7.0",
1515
"shortName": "razorclasslib",
1616
"tags": {
1717
"language": "C#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"generatorVersions": "[1.0.0.0-*)",
1111
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Core Razor Pages content",
1212
"groupIdentity": "Microsoft.Web.RazorPages",
13-
"precedence": "8000",
14-
"identity": "Microsoft.Web.RazorPages.CSharp.6.0",
13+
"precedence": "9000",
14+
"identity": "Microsoft.Web.RazorPages.CSharp.7.0",
1515
"shortName": [
1616
"webapp",
1717
"razor"
1818
],
19-
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
19+
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
2020
"tags": {
2121
"language": "C#",
2222
"type": "project"

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"generatorVersions": "[1.0.0.0-*)",
1010
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
1111
"groupIdentity": "Microsoft.Web.Mvc",
12-
"precedence": "8000",
13-
"identity": "Microsoft.Web.Mvc.CSharp.6.0",
12+
"precedence": "9000",
13+
"identity": "Microsoft.Web.Mvc.CSharp.7.0",
1414
"shortName": "mvc",
15-
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
15+
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
1616
"tags": {
1717
"language": "C#",
1818
"type": "project"

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"generatorVersions": "[1.0.0.0-*)",
1010
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
1111
"groupIdentity": "Microsoft.Web.Mvc",
12-
"precedence": "8000",
13-
"identity": "Microsoft.Web.Mvc.FSharp.6.0",
12+
"precedence": "9000",
13+
"identity": "Microsoft.Web.Mvc.FSharp.7.0",
1414
"shortName": "mvc",
15-
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
15+
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
1616
"tags": {
1717
"language": "F#",
1818
"type": "project"

‎src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"generatorVersions": "[1.0.0.0-*)",
1010
"description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
1111
"groupIdentity": "Microsoft.Web.WebApi",
12-
"precedence": "8000",
13-
"identity": "Microsoft.Web.WebApi.CSharp.6.0",
12+
"precedence": "9000",
13+
"identity": "Microsoft.Web.WebApi.CSharp.7.0",
1414
"shortName": "webapi",
1515
"tags": {
1616
"language": "C#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"generatorVersions": "[1.0.0.0-*)",
99
"description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
1010
"groupIdentity": "Microsoft.Web.WebApi",
11-
"precedence": "8000",
12-
"identity": "Microsoft.Web.WebApi.FSharp.6.0",
11+
"precedence": "9000",
12+
"identity": "Microsoft.Web.WebApi.FSharp.7.0",
1313
"shortName": "webapi",
1414
"tags": {
1515
"language": "F#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"generatorVersions": "[1.0.0.0-*)",
1111
"description": "An empty project template for creating a worker service.",
1212
"groupIdentity": "Microsoft.Worker.Empty",
13-
"precedence": "8000",
14-
"identity": "Microsoft.Worker.Empty.CSharp.6.0",
13+
"precedence": "9000",
14+
"identity": "Microsoft.Worker.Empty.CSharp.7.0",
1515
"shortName": "worker",
1616
"tags": {
1717
"language": "C#",

‎src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"generatorVersions": "[1.0.0.0-*)",
1111
"description": "An empty project template for creating a worker service.",
1212
"groupIdentity": "Microsoft.Worker.Empty",
13-
"precedence": "8000",
14-
"identity": "Microsoft.Worker.Empty.FSharp.6.0",
13+
"precedence": "9000",
14+
"identity": "Microsoft.Worker.Empty.FSharp.7.0",
1515
"shortName": "worker",
1616
"tags": {
1717
"language": "F#",

‎src/submodules/spa-templates

0 commit comments

Comments
 (0)