Skip to content

Commit 071212b

Browse files
ranganathan2020ranganathan2020
committed
Merge branch 'feature/orch-001/BD-846-net10-migration'
2 parents dcf428c + 7c3bed5 commit 071212b

10 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [main, develop]
88

99
env:
10-
DOTNET_VERSION: '8.0.x'
10+
DOTNET_VERSION: '10.0.x'
1111
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1212
DOTNET_CLI_TELEMETRY_OPTOUT: true
1313

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
tags: ['v*']
66

77
env:
8-
DOTNET_VERSION: '8.0.x'
8+
DOTNET_VERSION: '10.0.x'
99

1010
jobs:
1111
release:

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
2+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
33
WORKDIR /src
44

55
# Copy project files for restore
@@ -18,7 +18,7 @@ COPY src/ src/
1818
RUN dotnet publish src/OrderMonitor.Api/OrderMonitor.Api.csproj -c Release -o /app/publish
1919

2020
# Runtime stage
21-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
21+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
2222
WORKDIR /app
2323

2424
# Copy published app

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.102",
4+
"rollForward": "latestFeature"
5+
}
6+
}

‎src/OrderMonitor.Api/OrderMonitor.Api.csproj‎

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

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.23" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
1111
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.2" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/OrderMonitor.Core/OrderMonitor.Core.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>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎src/OrderMonitor.Infrastructure/OrderMonitor.Infrastructure.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<PropertyGroup>
16-
<TargetFramework>net8.0</TargetFramework>
16+
<TargetFramework>net10.0</TargetFramework>
1717
<ImplicitUsings>enable</ImplicitUsings>
1818
<Nullable>enable</Nullable>
1919
</PropertyGroup>

‎tests/OrderMonitor.IntegrationTests/OrderMonitor.IntegrationTests.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>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -12,9 +12,9 @@
1212
<ItemGroup>
1313
<PackageReference Include="coverlet.collector" Version="6.0.4" />
1414
<PackageReference Include="FluentAssertions" Version="8.8.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.*" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
17-
<PackageReference Include="Moq" Version="4.20.70" />
17+
<PackageReference Include="Moq" Version="4.20.72" />
1818
<PackageReference Include="xunit" Version="2.9.3" />
1919
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
2020
</ItemGroup>

‎tests/OrderMonitor.UnitTests/OrderMonitor.UnitTests.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">
22

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

@@ -12,10 +12,10 @@
1212
<ItemGroup>
1313
<PackageReference Include="coverlet.collector" Version="6.0.4" />
1414
<PackageReference Include="FluentAssertions" Version="8.8.0" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1616
<PackageReference Include="Moq" Version="4.20.72" />
17-
<PackageReference Include="xunit" Version="2.5.3" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
17+
<PackageReference Include="xunit" Version="2.9.3" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎tools/EncryptPassword/EncryptPassword.csproj‎

Lines changed: 1 addition & 1 deletion
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
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

0 commit comments

Comments
 (0)