Skip to content

Commit 2ef7fff

Browse files
mu88mu88
committed
feat!: upgrade to .NET 10
1 parent f29c2aa commit 2ef7fff

14 files changed

Lines changed: 523 additions & 831 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "C# (.NET)",
3-
"image": "ghcr.io/mu88/devcontainers-dotnet-playwright:sdk-9.0.304"
3+
"image": "ghcr.io/mu88/devcontainers-dotnet-playwright:sdk-10.0.100"
44
}

‎.github/workflows/CI_CD.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ jobs:
2828

2929
needs: ci_cd
3030

31-
uses: mu88/github-actions/.github/workflows/ci-cd.yml@5abbf0ac2dd5f5a4fbf4ab7f816ff85eca8f196a
31+
uses: mu88/github-actions/.github/workflows/ci-cd.yml@6bb14d0428677b74d3566fe980364a33a6136136
3232
with:
33+
docker-attest-provenance-and-sbom: false
3334
docker-publish-mode: regular
3435
docker-publish-project: src/ScreenshotCreator.Api/ScreenshotCreator.Api.csproj
3536
dotnet-test-additional-params-unit-integration-tests: '/p:ExcludeByFile=\"**/Log.Prefix.cs\"'

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Version>4.0.0</Version>
55
</PropertyGroup>
66
</Project>

‎Directory.Packages.props‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,28 @@
44
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
7+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
88
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
9-
<PackageVersion Include="FluentAssertions" Version="8.6.0" />
10-
<PackageVersion Include="FluentAssertions.Web.v8" Version="1.9.5"/>
11-
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.0"/>
12-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9"/>
13-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9"/>
14-
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="9.0.9"/>
15-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9"/>
16-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9"/>
17-
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.9"/>
18-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
19-
<PackageVersion Include="Microsoft.Playwright" Version="1.56.0"/>
20-
<PackageVersion Include="mu88.Shared" Version="3.1.0"/>
9+
<PackageVersion Include="FluentAssertions" Version="8.8.0" />
10+
<PackageVersion Include="FluentAssertions.Web.v8" Version="1.9.5" />
11+
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.1" />
12+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
13+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
14+
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="10.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
16+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
17+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
18+
<PackageVersion Include="Microsoft.Playwright" Version="1.56.0" />
19+
<PackageVersion Include="mu88.Shared" Version="4.0.0" />
2120
<PackageVersion Include="NSubstitute" Version="5.3.0" />
2221
<PackageVersion Include="NUnit" Version="4.4.0" />
23-
<PackageVersion Include="NUnit.Analyzers" Version="4.10.0" />
24-
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
25-
<PackageVersion Include="Scalar.AspNetCore" Version="2.8.11"/>
26-
<PackageVersion Include="Testcontainers" Version="4.6.0" />
22+
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
23+
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
24+
<PackageVersion Include="Scalar.AspNetCore" Version="2.11.0" />
25+
<PackageVersion Include="Testcontainers" Version="4.9.0" />
2726
</ItemGroup>
2827
<ItemGroup>
29-
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-8g4q-xg66-9fp4"/>
28+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-8g4q-xg66-9fp4" />
3029
<!-- Since it's an internal app only, I consider this okay -->
3130
</ItemGroup>
3231
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.303",
3+
"version": "10.0.100",
44
"rollForward": "latestPatch"
55
}
66
}

‎src/ScreenshotCreator.Api/Dockerfile-Playwright‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM --platform=$TARGETARCH mcr.microsoft.com/dotnet/aspnet:9.0.8 AS base
1+
FROM --platform=$TARGETARCH mcr.microsoft.com/dotnet/aspnet:10.0.0 AS base
22
ARG TARGETARCH
33
WORKDIR /app
44
COPY src/ScreenshotCreator.Api/install-powershell-$TARGETARCH.sh /scripts/install-powershell-$TARGETARCH.sh
55
RUN chmod +x /scripts/install-powershell-$TARGETARCH.sh
66
RUN /scripts/install-powershell-$TARGETARCH.sh
77

8-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.304 AS sdk
8+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0.100 AS sdk
99
WORKDIR /src_playwright
1010
RUN dotnet new console --no-restore
1111
RUN dotnet add package Microsoft.Playwright

‎src/ScreenshotCreator.Api/Log.cs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
public static partial class Log
44
{
5-
[LoggerMessage(EventId = 0,
6-
EventName = Prefix + nameof(BackgroundServiceTriggered),
7-
Level = LogLevel.Information,
8-
Message = "Background service triggered")]
5+
[LoggerMessage(
6+
EventId = 0,
7+
EventName = Prefix + nameof(BackgroundServiceTriggered),
8+
Level = LogLevel.Information,
9+
Message = "Background service triggered")]
910
public static partial void BackgroundServiceTriggered(this ILogger logger);
1011

11-
[LoggerMessage(EventId = 1,
12-
EventName = Prefix + nameof(BackgroundServiceDisabled),
13-
Level = LogLevel.Information,
14-
Message = "Background service disabled")]
12+
[LoggerMessage(
13+
EventId = 1,
14+
EventName = Prefix + nameof(BackgroundServiceDisabled),
15+
Level = LogLevel.Information,
16+
Message = "Background service disabled")]
1517
public static partial void BackgroundServiceDisabled(this ILogger logger);
1618
}

‎src/ScreenshotCreator.Api/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Microsoft.AspNetCore.Http.HttpResults;
12
using Microsoft.Extensions.Options;
23
using mu88.Shared.OpenTelemetry;
34
using Scalar.AspNetCore;
@@ -58,7 +59,7 @@
5859

5960
await app.RunAsync();
6061

61-
async Task<IResult> ReturnImageOrNotFoundAsync(HttpContext httpContext,
62+
async Task<Results<FileContentHttpResult, NotFound>> ReturnImageOrNotFoundAsync(HttpContext httpContext,
6263
ImageProcessor imageProcessor,
6364
IOptions<ScreenshotOptions> options,
6465
bool blackAndWhite = false,
@@ -67,14 +68,14 @@ async Task<IResult> ReturnImageOrNotFoundAsync(HttpContext httpContext,
6768
{
6869
if (!File.Exists(options.Value.ScreenshotFile))
6970
{
70-
return Results.NotFound();
71+
return TypedResults.NotFound();
7172
}
7273

7374
var processingResult = await imageProcessor.ProcessAsync(options.Value.ScreenshotFile, blackAndWhite, asWaveshareBytes);
7475

7576
var result = asWaveshareBytes
76-
? Results.Bytes(processingResult.Data, processingResult.MediaType)
77-
: Results.File(processingResult.Data, processingResult.MediaType);
77+
? TypedResults.Bytes(processingResult.Data, processingResult.MediaType)
78+
: TypedResults.File(processingResult.Data, processingResult.MediaType);
7879

7980
if (addWaveshareInstructions)
8081
{

‎src/ScreenshotCreator.Api/ScreenshotCreator.Api.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
44
<RuntimeIdentifiers>linux-x64;linux-arm64</RuntimeIdentifiers>
55
<ContainerRepository>mu88/screenshotcreator</ContainerRepository>
6-
<ContainerBaseImage>ghcr.io/mu88/screenshotcreator-playwright:9.0.27</ContainerBaseImage>
6+
<ContainerBaseImage>ghcr.io/mu88/screenshotcreator-playwright:10.0.40</ContainerBaseImage>
77
<PlaywrightPlatform>all</PlaywrightPlatform>
8-
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
98
</PropertyGroup>
109
<ItemGroup>
1110
<PackageReference Include="Microsoft.AspNetCore.OpenApi"/>
12-
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations"/>
1311
<PackageReference Include="mu88.Shared"/>
1412
<PackageReference Include="Scalar.AspNetCore"/>
1513
</ItemGroup>

0 commit comments

Comments
 (0)