Skip to content

Commit 1697638

Browse files
jasontaylordevjasontaylordev
authored
📦 Upgrade to .NET 7
1 parent 18efaa2 commit 1697638

29 files changed

+153
-112
lines changed

‎.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,3 @@ $RECYCLE.BIN/
448448
## Visual Studio Code
449449
##
450450
.vscode/*
451-
!.vscode/settings.json
452-
!.vscode/tasks.json
453-
!.vscode/launch.json
454-
!.vscode/extensions.json
455-
/deploy/main.parameters.json

‎RapidBlazor.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44

55
<id>JasonTaylorDev.RapidBlazor</id>
6-
<version>0.9.3</version>
6+
<version>7.0.0</version>
77
<title>Rapid Blazor Template</title>
88
<authors>JasonTaylorDev</authors>
99
<description>Rapid Blazor Template for .NET.</description>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.402"
3+
"version": "7.0.100-rc.2.22477.23"
44
}
55
}

‎setup.ps1‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function CreateWorkloadIdentity {
2626
# Create Azure AD Application Registration
2727
$applicationRegistrationDetails=$(az ad app create --display-name "$ProjectName$environmentName") | ConvertFrom-Json
2828

29-
# Create Federated Credential for ...
29+
# Create federated credentials
3030
$credential = @{
3131
name="$ProjectName$environmentName";
3232
issuer="https://token.actions.githubusercontent.com";
@@ -36,7 +36,6 @@ function CreateWorkloadIdentity {
3636

3737
$credential | az ad app federated-credential create --id $applicationRegistrationDetails.id --parameters "@-" | Out-Null
3838

39-
# Create Federated Credential for ...
4039
$credential = @{
4140
name="$ProjectName";
4241
issuer="https://token.actions.githubusercontent.com";

‎src/Application/Application.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>RapidBlazor.Application</RootNamespace>
@@ -12,10 +12,10 @@
1212
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
1313
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="10.4.0" />
1414
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
18-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.2.22472.11" />
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-rc.2.22472.3" />
18+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Domain/Domain.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>RapidBlazor.Domain</RootNamespace>

‎src/Infrastructure/Infrastructure.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>RapidBlazor.Infrastructure</RootNamespace>
@@ -13,13 +13,13 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.9" />
17-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.9" />
18-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.9" />
19-
<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.9" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.9" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9" />
16+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.0-rc.2.22476.2" />
17+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0-rc.2.22476.2" />
18+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.0-rc.2.22476.2" />
19+
<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.0-rc.2.22476.2" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rc.2.22472.11" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.2.22472.11" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rc.2.22472.11" />
2323
</ItemGroup>
2424

2525
</Project>

‎src/WebUI/Client/Client.csproj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<RootNamespace>RapidBlazor.WebUI.Client</RootNamespace>
8-
<AssemblyName>RapidBlazor.WebUI.Client</AssemblyName>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<RootNamespace>RapidBlazor.WebUI.Client</RootNamespace>
8+
<AssemblyName>RapidBlazor.WebUI.Client</AssemblyName>
9+
</PropertyGroup>
1010

11-
<ItemGroup>
12-
<PackageReference Include="Blazored.FluentValidation" Version="2.0.3" />
13-
<PackageReference Include="FluentValidation" Version="10.4.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.9" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.9" PrivateAssets="all" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.9" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
18-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
19-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
20-
<PackageReference Include="Scrutor" Version="4.2.0" />
21-
</ItemGroup>
11+
<ItemGroup>
12+
<PackageReference Include="Blazored.FluentValidation" Version="2.0.3" />
13+
<PackageReference Include="FluentValidation" Version="10.4.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-rc.2.22476.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-rc.2.22476.2" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.0-rc.2.22476.2" />
17+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0-rc.2.22472.3" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
19+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
20+
<PackageReference Include="Scrutor" Version="4.2.0" />
21+
</ItemGroup>
2222

23-
<ItemGroup>
24-
<ProjectReference Include="..\Shared\Shared.csproj" />
25-
</ItemGroup>
23+
<ItemGroup>
24+
<ProjectReference Include="..\Shared\Shared.csproj" />
25+
</ItemGroup>
2626

2727
</Project>

‎src/WebUI/Client/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
builder.RootComponents.Add<App>("#app");
1212
builder.RootComponents.Add<HeadOutlet>("head::after");
1313

14-
builder.Services.AddHttpClient("CleanArchitecture.WebUI.ServerAPI", client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
14+
builder.Services.AddHttpClient("RapidBlazor.WebUI.ServerAPI", client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
1515
.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
1616

1717
// Supply HttpClient instances that include access tokens when making requests to the server project
18-
builder.Services.AddScoped(sp => sp.GetRequiredService<IHttpClientFactory>().CreateClient("CleanArchitecture.WebUI.ServerAPI"));
18+
builder.Services.AddScoped(sp => sp.GetRequiredService<IHttpClientFactory>().CreateClient("RapidBlazor.WebUI.ServerAPI"));
1919

2020
builder.Services
2121
.AddApiAuthorization()

‎src/WebUI/Client/Properties/launchSettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"windowsAuthentication": false,
44
"anonymousAuthentication": true,
55
"iisExpress": {
6-
"applicationUrl": "http://localhost:7569",
6+
"applicationUrl": "http://localhost:5246",
77
"sslPort": 44376
88
}
99
},
1010
"profiles": {
11-
"RapidBlazor.WebUI": {
11+
"https": {
1212
"commandName": "Project",
1313
"dotnetRunMessages": true,
1414
"launchBrowser": true,
1515
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
16-
"applicationUrl": "https://localhost:7068;http://localhost:5096",
16+
"applicationUrl": "https://localhost:7124;http://localhost:5083",
1717
"environmentVariables": {
1818
"ASPNETCORE_ENVIRONMENT": "Development"
1919
}

0 commit comments

Comments
 (0)