diff --git a/.gitignore b/.gitignore index e04d651..98c6e07 100644 --- a/.gitignore +++ b/.gitignore @@ -448,8 +448,3 @@ $RECYCLE.BIN/ ## Visual Studio Code ## .vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -/deploy/main.parameters.json diff --git a/RapidBlazor.nuspec b/RapidBlazor.nuspec index 5299ddc..6833a61 100644 --- a/RapidBlazor.nuspec +++ b/RapidBlazor.nuspec @@ -3,7 +3,7 @@ JasonTaylorDev.RapidBlazor - 0.9.3 + 7.0.0 Rapid Blazor Template JasonTaylorDev Rapid Blazor Template for .NET. diff --git a/global.json b/global.json index 2948868..52534e2 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.402" + "version": "7.0.100-rc.2.22477.23" } } \ No newline at end of file diff --git a/setup.ps1 b/setup.ps1 index 9011dfb..f7bff95 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -26,7 +26,7 @@ function CreateWorkloadIdentity { # Create Azure AD Application Registration $applicationRegistrationDetails=$(az ad app create --display-name "$ProjectName$environmentName") | ConvertFrom-Json - # Create Federated Credential for ... + # Create federated credentials $credential = @{ name="$ProjectName$environmentName"; issuer="https://token.actions.githubusercontent.com"; @@ -36,7 +36,6 @@ function CreateWorkloadIdentity { $credential | az ad app federated-credential create --id $applicationRegistrationDetails.id --parameters "@-" | Out-Null - # Create Federated Credential for ... $credential = @{ name="$ProjectName"; issuer="https://token.actions.githubusercontent.com"; diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj index cf7e036..c3639d8 100644 --- a/src/Application/Application.csproj +++ b/src/Application/Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable RapidBlazor.Application @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/src/Domain/Domain.csproj b/src/Domain/Domain.csproj index d43a606..b76e25c 100644 --- a/src/Domain/Domain.csproj +++ b/src/Domain/Domain.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable RapidBlazor.Domain diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index 15a9113..20099a2 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -1,7 +1,7 @@ - + - net6.0 + net7.0 enable enable RapidBlazor.Infrastructure @@ -13,13 +13,13 @@ - - - - - - - + + + + + + + diff --git a/src/WebUI/Client/Client.csproj b/src/WebUI/Client/Client.csproj index 51a71cc..0b3bc26 100644 --- a/src/WebUI/Client/Client.csproj +++ b/src/WebUI/Client/Client.csproj @@ -1,27 +1,27 @@ - - net6.0 - enable - enable - RapidBlazor.WebUI.Client - RapidBlazor.WebUI.Client - + + net7.0 + enable + enable + RapidBlazor.WebUI.Client + RapidBlazor.WebUI.Client + - - - - - - - - - - - + + + + + + + + + + + - - - + + + diff --git a/src/WebUI/Client/Program.cs b/src/WebUI/Client/Program.cs index 0810d27..657c297 100644 --- a/src/WebUI/Client/Program.cs +++ b/src/WebUI/Client/Program.cs @@ -11,11 +11,11 @@ builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); -builder.Services.AddHttpClient("CleanArchitecture.WebUI.ServerAPI", client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)) +builder.Services.AddHttpClient("RapidBlazor.WebUI.ServerAPI", client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)) .AddHttpMessageHandler(); // Supply HttpClient instances that include access tokens when making requests to the server project -builder.Services.AddScoped(sp => sp.GetRequiredService().CreateClient("CleanArchitecture.WebUI.ServerAPI")); +builder.Services.AddScoped(sp => sp.GetRequiredService().CreateClient("RapidBlazor.WebUI.ServerAPI")); builder.Services .AddApiAuthorization() diff --git a/src/WebUI/Client/Properties/launchSettings.json b/src/WebUI/Client/Properties/launchSettings.json index 4f47ae0..4d00998 100644 --- a/src/WebUI/Client/Properties/launchSettings.json +++ b/src/WebUI/Client/Properties/launchSettings.json @@ -3,17 +3,17 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:7569", + "applicationUrl": "http://localhost:5246", "sslPort": 44376 } }, "profiles": { - "RapidBlazor.WebUI": { + "https": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "applicationUrl": "https://localhost:7068;http://localhost:5096", + "applicationUrl": "https://localhost:7124;http://localhost:5083", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/WebUI/Client/Shared/LoginDisplay.razor b/src/WebUI/Client/Shared/LoginDisplay.razor index 5e52e86..1862cec 100644 --- a/src/WebUI/Client/Shared/LoginDisplay.razor +++ b/src/WebUI/Client/Shared/LoginDisplay.razor @@ -1,13 +1,11 @@ @using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.WebAssembly.Authentication - @inject NavigationManager Navigation -@inject SignOutSessionStateManager SignOutManager Hello, @context.User.Identity?.Name! - + Register @@ -16,9 +14,8 @@ @code{ - private async Task BeginSignOut(MouseEventArgs args) + private void BeginLogOut() { - await SignOutManager.SetSignOutState(); - Navigation.NavigateTo("authentication/logout"); + Navigation.NavigateToLogout("authentication/logout"); } } diff --git a/src/WebUI/Client/Shared/NavMenu.razor b/src/WebUI/Client/Shared/NavMenu.razor index d657651..605e7b7 100644 --- a/src/WebUI/Client/Shared/NavMenu.razor +++ b/src/WebUI/Client/Shared/NavMenu.razor @@ -7,7 +7,7 @@ -
+