Skip to content

[7.0-preview1] Update precedence of templates for 7.0 #39794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 31, 2022
Merged

[7.0-preview1] Update precedence of templates for 7.0 #39794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d14f24
Update precedence of templates for 7.0
wtgodbe Jan 26, 2022
bf67778
Update documentation
wtgodbe Jan 26, 2022
5848f40
Update submodule
wtgodbe Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/UpdatingMajorVersionAndTFM.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda
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.
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.
* Do not merge this until the PR from the previous step is merged.
* Update template precedence
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.
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.
3. Make sure the new aka.ms link you're referencing in `thirdPartyNotices` exists.

### Validation

Expand Down
6 changes: 3 additions & 3 deletions ...plates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"generatorVersions": "[1.0.0.0-*)",
"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).",
"groupIdentity": "Microsoft.Web.Blazor.Server",
"precedence": "8000",
"identity": "Microsoft.Web.Blazor.Server.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.Blazor.Server.CSharp.7.0",
"shortName": "blazorserver",
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
"tags": {
"language": "C#",
"type": "project"
Expand Down
6 changes: 3 additions & 3 deletions .../Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"defaultName": "BlazorApp",
"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).",
"groupIdentity": "Microsoft.Web.Blazor.Wasm",
"precedence": "8000",
"precedence": "9000",
"guids": [
"4C26868E-5E7C-458D-82E3-040509D0C71F",
"5990939C-7E7B-4CFA-86FF-44CA5756498A",
Expand All @@ -20,8 +20,8 @@
"09732173-2cef-46b7-83db-1334bcb079d3", // Tenant ID
"53bc9b9d-9d6a-45d4-8429-2a2761773502" // Client ID
],
"identity": "Microsoft.Web.Blazor.Wasm.CSharp.6.0",
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
"identity": "Microsoft.Web.Blazor.Wasm.CSharp.7.0",
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
"preferNameDirectory": true,
"primaryOutputs": [
{
Expand Down
4 changes: 2 additions & 2 deletions ...jectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
"groupIdentity": "Microsoft.Web.Empty",
"precedence": "8000",
"identity": "Microsoft.Web.Empty.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.Empty.CSharp.7.0",
"shortName": "web",
"tags": {
"language": "C#",
Expand Down
4 changes: 2 additions & 2 deletions ...jectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
"groupIdentity": "Microsoft.Web.Empty",
"precedence": "8000",
"identity": "Microsoft.Web.Empty.FSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.Empty.FSharp.7.0",
"shortName": "web",
"tags": {
"language": "F#",
Expand Down
4 changes: 2 additions & 2 deletions ...tTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "A project template for creating a gRPC ASP.NET Core service.",
"groupIdentity": "Microsoft.Web.Grpc",
"precedence": "8000",
"identity": "Microsoft.Grpc.Service.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Grpc.Service.CSharp.7.0",
"shortName": "grpc",
"tags": {
"language": "C#",
Expand Down
4 changes: 2 additions & 2 deletions ...ates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a Razor class library that targets .NET Standard",
"groupIdentity": "Microsoft.Web.Razor",
"precedence": "8000",
"identity": "Microsoft.Web.Razor.Library.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.Razor.Library.CSharp.7.0",
"shortName": "razorclasslib",
"tags": {
"language": "C#",
Expand Down
6 changes: 3 additions & 3 deletions ...emplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Core Razor Pages content",
"groupIdentity": "Microsoft.Web.RazorPages",
"precedence": "8000",
"identity": "Microsoft.Web.RazorPages.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.RazorPages.CSharp.7.0",
"shortName": [
"webapp",
"razor"
],
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
"tags": {
"language": "C#",
"type": "project"
Expand Down
6 changes: 3 additions & 3 deletions ...ctTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"generatorVersions": "[1.0.0.0-*)",
"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.",
"groupIdentity": "Microsoft.Web.Mvc",
"precedence": "8000",
"identity": "Microsoft.Web.Mvc.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.Mvc.CSharp.7.0",
"shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
"tags": {
"language": "C#",
"type": "project"
Expand Down
6 changes: 3 additions & 3 deletions ...ctTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"generatorVersions": "[1.0.0.0-*)",
"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.",
"groupIdentity": "Microsoft.Web.Mvc",
"precedence": "8000",
"identity": "Microsoft.Web.Mvc.FSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.Mvc.FSharp.7.0",
"shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore/6.0-third-party-notices",
"thirdPartyNotices": "https://aka.ms/aspnetcore/7.0-third-party-notices",
"tags": {
"language": "F#",
"type": "project"
Expand Down
4 changes: 2 additions & 2 deletions ...rojectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"generatorVersions": "[1.0.0.0-*)",
"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.",
"groupIdentity": "Microsoft.Web.WebApi",
"precedence": "8000",
"identity": "Microsoft.Web.WebApi.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.WebApi.CSharp.7.0",
"shortName": "webapi",
"tags": {
"language": "C#",
Expand Down
4 changes: 2 additions & 2 deletions ...rojectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"generatorVersions": "[1.0.0.0-*)",
"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.",
"groupIdentity": "Microsoft.Web.WebApi",
"precedence": "8000",
"identity": "Microsoft.Web.WebApi.FSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Web.WebApi.FSharp.7.0",
"shortName": "webapi",
"tags": {
"language": "F#",
Expand Down
4 changes: 2 additions & 2 deletions ...rojectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "An empty project template for creating a worker service.",
"groupIdentity": "Microsoft.Worker.Empty",
"precedence": "8000",
"identity": "Microsoft.Worker.Empty.CSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Worker.Empty.CSharp.7.0",
"shortName": "worker",
"tags": {
"language": "C#",
Expand Down
4 changes: 2 additions & 2 deletions ...rojectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "An empty project template for creating a worker service.",
"groupIdentity": "Microsoft.Worker.Empty",
"precedence": "8000",
"identity": "Microsoft.Worker.Empty.FSharp.6.0",
"precedence": "9000",
"identity": "Microsoft.Worker.Empty.FSharp.7.0",
"shortName": "worker",
"tags": {
"language": "F#",
Expand Down
2 changes: 1 addition & 1 deletion src/submodules/spa-templates
Open in desktop
Submodule spa-templates updated 3 files
+2 −2 src/content/Angular-CSharp/.template.config/template.json
+2 −2 src/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.html
+2 −2 src/content/React-CSharp/.template.config/template.json