Skip to content

Commit 4b6a2ca

Browse files
t11omast11omas
authored
Upgraded to ,net 10 (#257)
1 parent 1aad9df commit 4b6a2ca

File tree

8 files changed

+34
-31
lines changed

8 files changed

+34
-31
lines changed

‎.github/workflows/check-pull-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/setup-dotnet@v5
3030
with:
3131
dotnet-version: |
32-
9.0
32+
10.0
3333
- name: Update NuGet.config
3434
run: |
3535
dotnet nuget remove source defra --configfile ./NuGet.config

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-dotnet@v5
2727
with:
2828
dotnet-version: |
29-
9.0
29+
10.0
3030
- name: Update NuGet.config
3131
run: |
3232
dotnet nuget remove source defra

‎.github/workflows/sonarcloud.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
26-
- name: Set up .NET 9.0
26+
- name: Set up .NET 10.0
2727
uses: actions/setup-dotnet@v5
2828
with:
2929
dotnet-version: |
30-
9.0
30+
10.0
3131
- name: Cache SonarCloud packages
3232
uses: actions/cache@v5
3333
with:

‎BtmsGateway/BtmsGateway.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -25,27 +25,27 @@
2525
<ItemGroup>
2626
<PackageReference Include="Amazon.CloudWatch.EMF" Version="2.2.0" />
2727

28-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.19" />
28+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.22" />
2929

3030
<PackageReference Include="Defra.TradeImportsDataApi.Domain" Version="0.33.0" />
3131
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0" />
3232
<PackageReference Include="Elastic.Serilog.Enrichers.Web" Version="9.0.0" />
3333
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
3434
<PackageReference Include="Humanizer.Core" Version="3.0.1" />
35-
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="9.0.11" />
36-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization" Version="9.10.0" />
37-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.11" />
38-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
35+
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="10.0.3" />
36+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization" Version="10.3.0" />
37+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.3" />
38+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
3939
<PackageReference Include="Polly" Version="8.6.5" />
40-
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
40+
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
4141
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
4242
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
43-
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
43+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
4444
<PackageReference Include="SlimMessageBus" Version="3.0.0" />
4545
<PackageReference Include="SlimMessageBus.Host.AmazonSQS" Version="3.3.6" />
4646
<PackageReference Include="SlimMessageBus.Host.Serialization.SystemTextJson" Version="3.3.6" />
4747
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
48-
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.8.0" />
48+
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.9.0" />
4949
</ItemGroup>
5050
<ItemGroup>
5151
<None Update="Services\Fixtures\DecisionNotification.xml">

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Base dotnet image
2-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
1+
# Base dotnet image
2+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
33
WORKDIR /app
44
EXPOSE 80
55
EXPOSE 443
@@ -14,7 +14,7 @@ RUN apt update && \
1414
rm -rf /var/lib/apt/lists/*
1515

1616
# Build stage image
17-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
17+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
1818
WORKDIR /src
1919

2020
COPY .config/dotnet-tools.json .config/dotnet-tools.json

‎tests/BtmsGateway.IntegrationTests/BtmsGateway.IntegrationTests.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="coverlet.collector" Version="6.0.4" />
9+
<PackageReference Include="coverlet.collector" Version="8.0.0">
10+
<PrivateAssets>all</PrivateAssets>
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
</PackageReference>
1013
<PackageReference Include="FluentAssertions" Version="8.8.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
13-
<PackageReference Include="MongoDB.Driver" Version="3.5.2" />
14-
<PackageReference Include="WireMock.Net.RestClient" Version="1.23.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
16+
<PackageReference Include="MongoDB.Driver" Version="3.6.0" />
17+
<PackageReference Include="WireMock.Net.RestClient" Version="1.25.0" />
1518
<PackageReference Include="xunit" Version="2.9.3" />
1619
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1720
<PrivateAssets>all</PrivateAssets>

‎tests/BtmsGateway.Test/BtmsGateway.Test.csproj‎

Lines changed: 6 additions & 6 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
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>disable</Nullable>
66
<IsPackable>false</IsPackable>
@@ -14,17 +14,17 @@
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="9.0.11" />
18-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
19-
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
17+
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="10.0.3" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
19+
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.3.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2121
<PackageReference Include="xunit" Version="2.9.3" />
2222
<PackageReference Include="NSubstitute" Version="5.3.0" />
2323
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>
27-
<PackageReference Include="coverlet.collector" Version="6.0.4">
27+
<PackageReference Include="coverlet.collector" Version="8.0.0">
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>

‎tests/Testing/Testing.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.7.0" />
9-
<PackageReference Include="Verify.Xunit" Version="31.9.3" />
10-
<PackageReference Include="WireMock.Net.FluentAssertions" Version="1.23.0" />
9+
<PackageReference Include="Verify.Xunit" Version="31.12.5" />
10+
<PackageReference Include="WireMock.Net.FluentAssertions" Version="1.25.0" />
1111
</ItemGroup>
1212
</Project>

0 commit comments

Comments
 (0)