Skip to content

Commit a203e6f

Browse files
author
Timothy Dodd
committed
Upgrade to .NET 10.0 and update dependencies
Upgraded the base image in the `Dockerfile` to .NET 10.0 for both `aspnet` and `sdk`. Updated `TargetFramework` in `LogMkAgent.csproj`, `LogMkApi.csproj`, and `LogMkCommon.csproj` from `net9.0` to `net10.0`. Updated package references across projects to ensure compatibility with .NET 10.0, including `Microsoft.AspNetCore.Authentication.JwtBearer`, `Microsoft.Extensions.Diagnostics.HealthChecks`, `Microsoft.AspNetCore.SpaProxy`, `Testcontainers`, `Testcontainers.MySql`, and `Microsoft.Data.Sqlite`. Modified the `Dockerfile` to expose port 8080 and include additional project files (`LogMkWeb/logmk.esproj`) for building. Updated the `RoboDodd.OrmLite` submodule to a new state with local changes. These changes ensure compatibility with .NET 10.0, align the container environment, and keep dependencies up-to-date.
1 parent 035b01b commit a203e6f

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎src/LogMkAgent/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#See https://aka.ms/customizecontainer to learn how to customize your debug container and 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
USER app
55
WORKDIR /app
66

7-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
7+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
88
ARG BUILD_CONFIGURATION=Release
99
WORKDIR /src
1010
COPY ["LogMkAgent/LogMkAgent.csproj", "LogMkAgent/"]

‎src/LogMkAgent/LogMkAgent.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<PublishAot>false</PublishAot>
@@ -13,10 +13,10 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
19-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.2" />
17+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.2" />
18+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
19+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/LogMkApi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#See https://aka.ms/customizecontainer to learn how to customize your debug container and 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
USER app
55
WORKDIR /app
66
EXPOSE 8080
77

8-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
8+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
99
ARG BUILD_CONFIGURATION=Release
1010
WORKDIR /src
1111
COPY ["LogMkApi/LogMkApi.csproj", "LogMkApi/"]

‎src/LogMkApi/LogMkApi.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -14,12 +14,12 @@
1414

1515
<ItemGroup>
1616

17-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11" />
18-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.2" />
18+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.2" />
1919
<PackageReference Include="MySql.Data" Version="9.5.0" />
20-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
20+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
2121
<PackageReference Include="Microsoft.AspNetCore.SpaProxy">
22-
<Version>10.0.0</Version>
22+
<Version>10.0.2</Version>
2323
</PackageReference>
2424
</ItemGroup>
2525
<ItemGroup>

‎src/LogMkCommon/LogMkCommon.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
</PropertyGroup>

0 commit comments

Comments
 (0)