Skip to content

Commit 81e4f06

Browse files
neozhuneozhu
committed
Upgrade to .NET 10.0 and update dependencies
Updated the Dockerfile to use .NET 10.0 for both base and build images, and added commands for package list updates and font installation. Updated all project files to target .NET 10.0, including `Application.csproj`, `Domain.csproj`, `Infrastructure.csproj`, `Migrators` projects, `Server.UI.csproj`, and test projects. Updated various package references to version 10.0.0, including `Microsoft.AspNetCore.Components.Web`, `Microsoft.EntityFrameworkCore`, and others. Updated `Microsoft.NET.Test.Sdk` to version 18.0.1.
1 parent 9a522ad commit 81e4f06

11 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
1+
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
44
# apt update and install fonts
55
RUN echo "deb http://deb.debian.org/debian/ bookworm main contrib" > /etc/apt/sources.list && \
66
echo "deb-src http://deb.debian.org/debian/ bookworm main contrib" >> /etc/apt/sources.list && \
@@ -33,7 +33,7 @@ EXPOSE 443
3333

3434

3535

36-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
36+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
3737
ARG BUILD_CONFIGURATION=Release
3838
WORKDIR /src
3939
COPY ["src/Migrators/Migrators.MSSQL/Migrators.MSSQL.csproj", "src/Migrators/Migrators.MSSQL/"]

‎src/Application/Application.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<RootNamespace>CleanArchitecture.Blazor.Application</RootNamespace>
55
<AssemblyName>CleanArchitecture.Blazor.Application</AssemblyName>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="jcamp.FluentEmail.Razor" Version="4.0.0" />
1818
<PackageReference Include="FluentValidation" Version="12.1.0" />
1919
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.0" />
20-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.10" />
21-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.10" />
20+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.0" />
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2323
<PackageReference Include="Riok.Mapperly" Version="4.3.0" />
2424
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />

‎src/Domain/Domain.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>CleanArchitecture.Blazor.Domain</RootNamespace>
66
<AssemblyName>CleanArchitecture.Blazor.Domain</AssemblyName>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -11,23 +11,23 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="MediatR" Version="12.4.1" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
15-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
1616
<PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
1717
<PackageReference Include="EntityFrameworkCore.Exceptions.Sqlite" Version="8.1.3" />
1818
<PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="8.1.3" />
19-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.10" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
23-
<PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
24-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.10" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
19+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.2" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
23+
<PackageReference Include="EFCore.NamingConventions" Version="10.0.0-rc.2" />
24+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.10" />
30+
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="10.0.0" />
3131
</ItemGroup>
3232

3333
</Project>

‎src/Infrastructure/Infrastructure.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<RootNamespace>CleanArchitecture.Blazor.Infrastructure</RootNamespace>
55
<AssemblyName>CleanArchitecture.Blazor.Infrastructure</AssemblyName>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<LangVersion>default</LangVersion>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.10" />
12-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.10" />
13-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.10" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.0" />
1414
<PackageReference Include="QuestPDF" Version="2025.7.4" />
1515
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1616
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="9.0.2" />

‎src/Migrators/Migrators.MSSQL/Migrators.MSSQL.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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AssemblyName>CleanArchitecture.Blazor.Migrators.MSSQL</AssemblyName>

‎src/Migrators/Migrators.PostgreSQL/Migrators.PostgreSQL.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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AssemblyName>CleanArchitecture.Blazor.Migrators.PostgreSQL</AssemblyName>

‎src/Migrators/Migrators.SqLite/Migrators.SqLite.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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AssemblyName>CleanArchitecture.Blazor.Migrators.SqLite</AssemblyName>

‎src/Server.UI/Server.UI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<RootNamespace>CleanArchitecture.Blazor.Server.UI</RootNamespace>
55
<AssemblyName>CleanArchitecture.Blazor.Server.UI</AssemblyName>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<NoWarn>$(NoWarn);VSTHRD200</NoWarn>
99
<ImplicitUsings>enable</ImplicitUsings>
@@ -19,11 +19,11 @@
1919
<PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
2020
<PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
2121
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
22-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
22+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
2323
<PackageReference Include="MudBlazor" Version="8.14.0" />
2424
<PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.1" />
2525
<PackageReference Include="Blazor-ApexCharts" Version="6.0.2" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>

‎tests/Application.IntegrationTests/Application.IntegrationTests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>CleanArchitecture.Blazor.Application.IntegrationTests</RootNamespace>
66
<AssemblyName>CleanArchitecture.Blazor.Application.IntegrationTests</AssemblyName>
77

@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2525
<PackageReference Include="nunit" Version="4.4.0" />
2626
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
2727
<PrivateAssets>all</PrivateAssets>

‎tests/Application.UnitTests/Application.UnitTests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>CleanArchitecture.Blazor.Application.UnitTests</RootNamespace>
66
<AssemblyName>CleanArchitecture.Blazor.Application.UnitTests</AssemblyName>
77

@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1515
<PackageReference Include="nunit" Version="4.4.0" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
1717
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)