From 7db552674af2532c8b7a7d3069f67687d6109b14 Mon Sep 17 00:00:00 2001 From: DamianEdwards Date: Wed, 30 Jun 2021 17:29:17 -0700 Subject: [PATCH] Enable nullable references in project templates Contributes to #33947 --- .../BlazorServerWeb-CSharp.csproj.in | 1 + .../ComponentsWebAssembly-CSharp.Client.csproj.in | 1 + .../ComponentsWebAssembly-CSharp.Server.csproj.in | 1 + .../ComponentsWebAssembly-CSharp.Shared.csproj.in | 1 + .../Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in | 1 + .../GrpcService-CSharp.csproj.in | 1 + .../RazorClassLibrary-CSharp.csproj.in | 1 + .../RazorPagesWeb-CSharp.csproj.in | 1 + .../Web.ProjectTemplates/StarterWeb-CSharp.csproj.in | 1 + .../Web.ProjectTemplates/WebApi-CSharp.csproj.in | 1 + .../Web.ProjectTemplates/Worker-CSharp.csproj.in | 1 + .../Areas/Identity/Pages/Shared/_LoginPartial.cshtml | 2 +- .../BlazorServerWeb-CSharp/Data/WeatherForecast.cs | 2 +- .../BlazorServerWeb-CSharp/Pages/Error.cshtml.cs | 2 +- .../BlazorServerWeb-CSharp/Pages/FetchData.razor | 2 +- .../Shared/LoginDisplay.IndividualB2CAuth.razor | 4 ++-- .../Shared/LoginDisplay.IndividualLocalAuth.razor | 2 +- .../Shared/LoginDisplay.OrganizationalAuth.razor | 2 +- .../Shared/LoginDisplay.WindowsAuth.razor | 2 +- .../Shared/NavMenu.CallsMicrosoftGraph.razor | 2 +- .../Shared/NavMenu.CallsWebApi.razor | 2 +- .../Shared/NavMenu.NoGraphOrApi.razor | 2 +- .../BlazorServerWeb-CSharp/Shared/SurveyPrompt.razor | 2 +- .../Client/Pages/FetchData.razor | 4 ++-- .../Shared/LoginDisplay.IndividualLocalAuth.razor | 4 ++-- .../Shared/LoginDisplay.IndividualMsalAuth.razor | 2 +- .../Client/Shared/NavMenu.razor | 2 +- .../Client/Shared/SurveyPrompt.razor | 2 +- .../Areas/Identity/Pages/Shared/_LoginPartial.cshtml | 2 +- .../Server/Pages/Error.cshtml.cs | 2 +- .../Shared/WeatherForecast.cs | 2 +- .../RazorPagesWeb-CSharp/Pages/Error.cshtml.cs | 2 +- .../RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml | 2 +- .../Pages/Shared/_LoginPartial.Identity.cshtml | 2 +- .../Pages/Shared/_LoginPartial.OrgAuth.cshtml | 10 +++++----- .../StarterWeb-CSharp/Models/ErrorViewModel.cs | 2 +- .../StarterWeb-CSharp/Views/Shared/Error.cshtml | 4 ++-- .../StarterWeb-CSharp/Views/Shared/_Layout.cshtml | 2 +- .../Views/Shared/_LoginPartial.Identity.cshtml | 2 +- .../Views/Shared/_LoginPartial.OrgAuth.cshtml | 10 +++++----- .../content/WebApi-CSharp/WeatherForecast.cs | 2 +- .../Angular-CSharp.csproj.in | 1 + .../Web.Spa.ProjectTemplates/React-CSharp.csproj.in | 1 + .../Angular-CSharp/.template.config/template.json | 3 ++- .../content/Angular-CSharp/Pages/Error.cshtml.cs | 2 +- .../content/Angular-CSharp/WeatherForecast.cs | 2 +- .../React-CSharp/.template.config/template.json | 3 ++- .../content/React-CSharp/Pages/Error.cshtml.cs | 2 +- .../React-CSharp/Pages/Shared/_LoginPartial.cshtml | 2 +- .../content/React-CSharp/WeatherForecast.cs | 2 +- src/ProjectTemplates/scripts/.gitignore | 5 +++++ src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 | 12 ++++++++++++ src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 | 12 ++++++++++++ src/ProjectTemplates/scripts/Test-Template.ps1 | 7 ++++--- 54 files changed, 97 insertions(+), 52 deletions(-) create mode 100644 src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 create mode 100644 src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in index fb2add30603f..3aa0d59a356c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable aspnet-BlazorServerWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in index 4fbe364042a7..b323afcf4dd2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable service-worker-assets.js diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in index 67f34756c0fc..a3dad84ee5ad 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable ComponentsWebAssembly-CSharp.Server-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Shared.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Shared.csproj.in index fdffee5bc537..3116e35440b1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Shared.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Shared.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable diff --git a/src/ProjectTemplates/Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 29cbeb320f96..d6194302d3ea 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable True Company.WebApplication1 preview diff --git a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in index f7a69fba22f2..2648730fd546 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in index 298bcecd8dd1..bbb34e70009d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable true Company.RazorClassLibrary1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 5869c4f86890..6f93d927ca87 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d True Company.WebApplication1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 2da0a7fcb7d4..854c6b9efa17 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 True Company.WebApplication1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in index 24f92d2299c7..3624e77631ce 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 True Company.WebApplication1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in index 284920b4f68c..77a387f3f6bd 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable dotnet-Company.Application1-53bc9b9d-9d6a-45d4-8429-2a2761773502 True Company.Application1 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml index a4f854aac31f..eda27e908a71 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml @@ -7,7 +7,7 @@ @if (SignInManager.IsSignedIn(User)) {
  • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
  • diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/WeatherForecast.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/WeatherForecast.cs index dbe0d36a71e1..b5247b3cdfb7 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/WeatherForecast.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/WeatherForecast.cs @@ -10,6 +10,6 @@ public class WeatherForecast public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - public string Summary { get; set; } + public string? Summary { get; set; } } } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml.cs index 4c944dc5d82c..f31173281588 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml.cs @@ -13,7 +13,7 @@ namespace BlazorServerWeb_CSharp.Pages [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor index ea60772f8bf8..07550a157a70 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor @@ -37,7 +37,7 @@ else } @code { - private WeatherForecast[] forecasts; + private WeatherForecast[]? forecasts; protected override async Task OnInitializedAsync() { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor index f185b33f6a79..4b78bfa1fba8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor @@ -6,11 +6,11 @@ @if (canEditProfile) { - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! } else { - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! } Log out diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualLocalAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualLocalAuth.razor index 25f9db264b4a..b4e823afdf13 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualLocalAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.IndividualLocalAuth.razor @@ -1,6 +1,6 @@  - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.OrganizationalAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.OrganizationalAuth.razor index 0fcc5bd960fa..355402c75290 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.OrganizationalAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.OrganizationalAuth.razor @@ -1,6 +1,6 @@  - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! Log out diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.WindowsAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.WindowsAuth.razor index bf579153e2b6..de92ffd80446 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.WindowsAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/LoginDisplay.WindowsAuth.razor @@ -1,3 +1,3 @@  - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsMicrosoftGraph.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsMicrosoftGraph.razor index 0f1ca20ce43b..e2560f475195 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsMicrosoftGraph.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsMicrosoftGraph.razor @@ -33,7 +33,7 @@ @code { private bool collapseNavMenu = true; - private string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; private void ToggleNavMenu() { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsWebApi.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsWebApi.razor index 5ff1bcc48f17..e3c5fa2d38b2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsWebApi.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.CallsWebApi.razor @@ -33,7 +33,7 @@ @code { private bool collapseNavMenu = true; - private string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; private void ToggleNavMenu() { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.NoGraphOrApi.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.NoGraphOrApi.razor index 3ef704312275..d2d9f0920d25 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.NoGraphOrApi.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.NoGraphOrApi.razor @@ -28,7 +28,7 @@ @code { private bool collapseNavMenu = true; - private string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; private void ToggleNavMenu() { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/SurveyPrompt.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/SurveyPrompt.razor index 67270dc0f42d..8b0973e8d0ae 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/SurveyPrompt.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/SurveyPrompt.razor @@ -12,5 +12,5 @@ @code { // Demonstrates how a parent component can supply parameters [Parameter] - public string Title { get; set; } + public string? Title { get; set; } } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor index a36d7d157d4b..c7f29e303752 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor @@ -45,7 +45,7 @@ else } @code { - private WeatherForecast[] forecasts; + private WeatherForecast[]? forecasts; protected override async Task OnInitializedAsync() { @@ -74,7 +74,7 @@ else public int TemperatureC { get; set; } - public string Summary { get; set; } + public string? Summary { get; set; } public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualLocalAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualLocalAuth.razor index 7cee41dcd07f..ce8bd5070af0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualLocalAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualLocalAuth.razor @@ -7,7 +7,7 @@ @*#if (Hosted) - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! @@ -16,7 +16,7 @@ #else - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualMsalAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualMsalAuth.razor index 1ecb6b202472..7ebea5d348e3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualMsalAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/LoginDisplay.IndividualMsalAuth.razor @@ -6,7 +6,7 @@ - Hello, @context.User.Identity.Name! + Hello, @context.User.Identity?.Name! diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/NavMenu.razor index 1afa4c3a2888..fb04d2c242e0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/NavMenu.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/NavMenu.razor @@ -28,7 +28,7 @@ @code { private bool collapseNavMenu = true; - private string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; private void ToggleNavMenu() { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/SurveyPrompt.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/SurveyPrompt.razor index a927a322f2b3..2f7758536aad 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/SurveyPrompt.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Shared/SurveyPrompt.razor @@ -12,5 +12,5 @@ @code { // Demonstrates how a parent component can supply parameters [Parameter] - public string Title { get; set; } + public string? Title { get; set; } } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml index 913f4c479bf7..1be0a5451871 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml @@ -15,7 +15,7 @@ @if (SignInManager.IsSignedIn(User)) {
  • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
  • diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Error.cshtml.cs index 92282ce4c268..7f7954b08457 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Error.cshtml.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Error.cshtml.cs @@ -13,7 +13,7 @@ namespace ComponentsWebAssembly_CSharp.Server.Pages [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Shared/WeatherForecast.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Shared/WeatherForecast.cs index 32e3d002de0b..9f0d7ac7a405 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Shared/WeatherForecast.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Shared/WeatherForecast.cs @@ -10,7 +10,7 @@ public class WeatherForecast public int TemperatureC { get; set; } - public string Summary { get; set; } + public string? Summary { get; set; } public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs index 10108d2b1017..121dc6440ee1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs @@ -13,7 +13,7 @@ namespace Company.WebApplication1.Pages [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml index d13e40d4a67f..5f16c50b8562 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml @@ -28,7 +28,7 @@ @*#if (IndividualAuth || OrganizationalAuth) #elseif (WindowsAuth) -

    Hello, @User.Identity.Name!

    +

    Hello, @User.Identity?.Name!

    #endif*@ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.Identity.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.Identity.cshtml index c45b365fd466..7cc3147e0816 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.Identity.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.Identity.cshtml @@ -6,7 +6,7 @@ @if (SignInManager.IsSignedIn(User)) {
  • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
  • diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.OrgAuth.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.OrgAuth.cshtml index 8f7c9041e83e..9e3a8af9c03c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.OrgAuth.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.OrgAuth.cshtml @@ -11,20 +11,20 @@
      @*#if (IndividualB2CAuth) -@if (User.Identity.IsAuthenticated) +@if (User.Identity?.IsAuthenticated == true) { @if (!string.IsNullOrEmpty(options.EditProfilePolicyId)) {
    • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
      • } else {
    • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
      • }
    • @@ -38,10 +38,10 @@ else
      • } #else -@if (User.Identity.IsAuthenticated) +@if (User.Identity?.IsAuthenticated == true) {
    • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
    • Sign out diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ErrorViewModel.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ErrorViewModel.cs index 6fe06d375908..665acaf669be 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ErrorViewModel.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ErrorViewModel.cs @@ -4,7 +4,7 @@ namespace Company.WebApplication1.Models { public class ErrorViewModel { - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml index a1e04783c67a..10cf32b713d0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml @@ -6,10 +6,10 @@

      Error.

      An error occurred while processing your request.

      -@if (Model.ShowRequestId) +@if (Model?.ShowRequestId ?? false) {

      - Request ID: @Model.RequestId + Request ID: @Model?.RequestId

      } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml index 91081c5999c1..ee650191fa28 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml @@ -28,7 +28,7 @@ @*#if (IndividualAuth || OrganizationalAuth) #elseif (WindowsAuth) -

      Hello, @User.Identity.Name!

      +

      Hello, @User.Identity?.Name!

      #endif*@ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.Identity.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.Identity.cshtml index cd256aa9249f..921dbe1ebc8b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.Identity.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.Identity.cshtml @@ -6,7 +6,7 @@ @if (SignInManager.IsSignedIn(User)) {
    • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
    • diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.OrgAuth.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.OrgAuth.cshtml index da2cbaf70188..74adb1a321ae 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.OrgAuth.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.OrgAuth.cshtml @@ -12,20 +12,20 @@ var options = AzureADB2COptions.Value;
        @*#if (IndividualB2CAuth) -@if (User.Identity.IsAuthenticated) +@if (User.Identity?.IsAuthenticated == true) { @if (!string.IsNullOrEmpty(options.EditProfilePolicyId)) {
      • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
        • } else {
      • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
        • }
      • @@ -39,10 +39,10 @@ else
        • } #else -@if (User.Identity.IsAuthenticated) +@if (User.Identity?.IsAuthenticated == true) {
      • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
      • Sign out diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/WeatherForecast.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/WeatherForecast.cs index 128b3473696e..7ff35e1a61bc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/WeatherForecast.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/WeatherForecast.cs @@ -10,6 +10,6 @@ public class WeatherForecast public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - public string Summary { get; set; } + public string? Summary { get; set; } } } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index bd68bc27bc01..c70516484885 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable false ClientApp\ https://localhost:5002 diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 43706ed0b473..5eb953dda24b 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -2,6 +2,7 @@ ${DefaultNetCoreTargetFramework} + enable true Latest false 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 1302b3fd2ae5..7249d2e9e6df 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 @@ -25,7 +25,8 @@ ".template.config/**" ], "copyOnly": [ - "wwwroot/**" + "wwwroot/**", + "ClientApp/package-lock.json" ], "modifiers": [ { diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs index b31bc6addd1f..4c1de861dd12 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Error.cshtml.cs @@ -19,7 +19,7 @@ public ErrorModel(ILogger logger) _logger = logger; } - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/WeatherForecast.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/WeatherForecast.cs index 128b3473696e..7ff35e1a61bc 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/WeatherForecast.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/WeatherForecast.cs @@ -10,6 +10,6 @@ public class WeatherForecast public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - public string Summary { get; set; } + public string? Summary { get; set; } } } 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 0d47ffbc17d5..47ea11d9f615 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 @@ -25,7 +25,8 @@ ".template.config/**" ], "copyOnly": [ - "wwwroot/**" + "wwwroot/**", + "ClientApp/package-lock.json" ], "modifiers": [ { diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs index b31bc6addd1f..4c1de861dd12 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Error.cshtml.cs @@ -19,7 +19,7 @@ public ErrorModel(ILogger logger) _logger = logger; } - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Shared/_LoginPartial.cshtml b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Shared/_LoginPartial.cshtml index f2884db7adca..8e7fccb5b361 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Shared/_LoginPartial.cshtml +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Shared/_LoginPartial.cshtml @@ -16,7 +16,7 @@ @if (SignInManager.IsSignedIn(User)) {
      • - Hello @User.Identity.Name! + Hello @User.Identity?.Name!
      • diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/WeatherForecast.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/WeatherForecast.cs index 128b3473696e..7ff35e1a61bc 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/WeatherForecast.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/WeatherForecast.cs @@ -10,6 +10,6 @@ public class WeatherForecast public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - public string Summary { get; set; } + public string? Summary { get; set; } } } diff --git a/src/ProjectTemplates/scripts/.gitignore b/src/ProjectTemplates/scripts/.gitignore index 6a831906ccc2..ceb08c3caee9 100644 --- a/src/ProjectTemplates/scripts/.gitignore +++ b/src/ProjectTemplates/scripts/.gitignore @@ -8,3 +8,8 @@ mvc/ razor/ react/ reactredux/ +web/ +webapp/ +webapi/ +worker/ +grpc/ \ No newline at end of file diff --git a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 new file mode 100644 index 000000000000..467d6e57e76e --- /dev/null +++ b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 @@ -0,0 +1,12 @@ +#!/usr/bin/env pwsh +#requires -version 4 + +[CmdletBinding(PositionalBinding = $false)] +param() + +Set-StrictMode -Version 2 +$ErrorActionPreference = 'Stop' + +. $PSScriptRoot\Test-Template.ps1 + +Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 new file mode 100644 index 000000000000..2803a34d9c9c --- /dev/null +++ b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 @@ -0,0 +1,12 @@ +#!/usr/bin/env pwsh +#requires -version 4 + +[CmdletBinding(PositionalBinding = $false)] +param() + +Set-StrictMode -Version 2 +$ErrorActionPreference = 'Stop' + +. $PSScriptRoot\Test-Template.ps1 + +Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Test-Template.ps1 b/src/ProjectTemplates/scripts/Test-Template.ps1 index d35dba4649c8..8cc65f90e2c8 100644 --- a/src/ProjectTemplates/scripts/Test-Template.ps1 +++ b/src/ProjectTemplates/scripts/Test-Template.ps1 @@ -32,18 +32,19 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) { $proj = "$tmpDir/$templateName.$extension" $projContent = Get-Content -Path $proj -Raw $projContent = $projContent -replace ('', " - + + true ") $projContent | Set-Content $proj dotnet.exe ef migrations add mvc dotnet.exe publish --configuration Release - dotnet.exe bin\Release\net6.0\publish\$templateName.dll + Set-Location .\bin\Release\net6.0\publish + Invoke-Expression "./$templateName.exe" } finally { Pop-Location - Run-DotnetNew "--debug:reinit" } }