Skip to content

Commit 74a470f

Browse files
authored
Upgrade to net10 (#1474)
* Upgrade to .NET 10 preview * Fix GitHub Actions to use dotnet-quality: preview for .NET 10 * Update CodeQL workflow to use .NET 10 preview * Add .NET 10 preview support to Azure Pipelines * Fix Dockerfile to use correct .NET 10 preview image tags
1 parent d31abb2 commit 74a470f

File tree

10 files changed

+27
-17
lines changed

10 files changed

+27
-17
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v4
2424
- uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: '9.0.x'
26+
dotnet-version: '10.0.x'
2727
dotnet-quality: 'preview'
2828
- name: Initialize CodeQL
2929
uses: github/codeql-action/init@v3

.github/workflows/spms-dotnet.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: '9.0.x'
23+
dotnet-version: '10.0.x'
24+
dotnet-quality: 'preview'
2425
- name: Install Dependencies
2526
run: dotnet restore
2627
- name: Build

.idea/.idea.SimplePasswordManagerService/.idea/aws.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0-preview-alpine AS build-env
22
WORKDIR /App
33

44
# Copy everything
@@ -9,7 +9,7 @@ RUN dotnet restore
99
RUN dotnet publish SimplePasswordManagerService -c Release -o out
1010

1111
# Build runtime image
12-
FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
12+
FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview-alpine
1313
WORKDIR /App
1414
COPY --from=build-env /App/out .
1515
ENTRYPOINT ["dotnet", "SimplePasswordManagerService.dll"]

SimplePasswordManagerService.Business.Tests/SimplePasswordManagerService.Business.Tests.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

SimplePasswordManagerService.Business/SimplePasswordManagerService.Business.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
10+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
1111
<PackageReference Include="MongoDB.Driver" Version="3.4.2" />
1212
</ItemGroup>
1313

SimplePasswordManagerService.Infra/src/SimplePasswordManagerServiceInfra/SimplePasswordManagerService.Infra.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<!-- Roll forward to future major versions of the netcoreapp as needed -->
77
<RollForward>Major</RollForward>
88
</PropertyGroup>
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Amazon.CDK.AWS.AppRunner.Alpha" Version="2.207.0-alpha.0" />
1313
<PackageReference Include="Amazon.CDK.Lib" Version="2.207.0" />
1414
<PackageReference Include="Constructs" Version="10.4.2" />
15-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
15+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
1616

1717
<!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
1818
<PackageReference Include="Amazon.Jsii.Analyzers" Version="*" PrivateAssets="all" />

SimplePasswordManagerService.Integration.Tests/SimplePasswordManagerService.Integration.Tests.csproj

Lines changed: 3 additions & 3 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
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -13,8 +13,8 @@
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7" />
17-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.6.25358.103" />
17+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1919
<PackageReference Include="xunit" Version="2.9.3" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">

SimplePasswordManagerService/SimplePasswordManagerService.csproj

Lines changed: 4 additions & 4 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
<UserSecretsId>aspnet-SimplePasswordManagerService-e87cf52d-48e4-43d3-8946-706d8aade0ef</UserSecretsId>
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" NoWarn="NU1605" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.7" NoWarn="NU1605" />
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
14+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-preview.6.25358.103" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0-preview.6.25358.103" />
16+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
1717
<PackageReference Include="Microsoft.Identity.Web" Version="3.11.0" />
1818
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.11.0" />
1919
</ItemGroup>

build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,18 @@ parameters:
99
default: 'ap-southeast-1'
1010

1111
steps:
12+
- task: UseDotNet@2
13+
displayName: 'Install .NET 10 Preview'
14+
inputs:
15+
packageType: 'sdk'
16+
version: '10.0.x'
17+
includePreviewVersions: true
1218
- script: npm install -g aws-cdk
1319
displayName: 'Install AWS CDK'
20+
- script: dotnet restore
21+
displayName: 'Restore .NET packages'
22+
- script: dotnet build --no-restore -c Release
23+
displayName: 'Build .NET projects'
1424
- script: cd SimplePasswordManagerService.Infra && cdk synth
1525
displayName: 'CDK Synth'
1626
- task: Docker@2

0 commit comments

Comments
 (0)