Skip to content

Commit d93bf4e

Browse files
committed
(#204) Upgrade .Net 8
1 parent 0859344 commit d93bf4e

File tree

39 files changed

+188
-219
lines changed

39 files changed

+188
-219
lines changed

.github/workflows/.net-build-monolith.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET Core
2323
uses: actions/setup-dotnet@v1
2424
with:
25-
dotnet-version: 7.0.101
25+
dotnet-version: 8.0.100
2626

2727
- name: Build
2828
run: dotnet build --configuration Release
@@ -52,40 +52,40 @@ jobs:
5252
uses: actions/[email protected]
5353
with:
5454
name: ClassifiedAds.BackgroundServer
55-
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
55+
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net8.0/publish
5656

5757
- name: Upload ClassifiedAds.GraphQL
5858
uses: actions/[email protected]
5959
with:
6060
name: ClassifiedAds.GraphQL
61-
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net7.0/publish
61+
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net8.0/publish
6262

6363
- name: Upload ClassifiedAds.Migrator
6464
uses: actions/[email protected]
6565
with:
6666
name: ClassifiedAds.Migrator
67-
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
67+
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net8.0/publish
6868

6969
- name: Upload ClassifiedAds.WebAPI
7070
uses: actions/[email protected]
7171
with:
7272
name: ClassifiedAds.WebAPI
73-
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
73+
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net8.0/publish
7474

7575
- name: Upload ClassifiedAds.WebMVC
7676
uses: actions/[email protected]
7777
with:
7878
name: ClassifiedAds.WebMVC
79-
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net7.0/publish
79+
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net8.0/publish
8080

8181
- name: Upload ClassifiedAds.BlazorServerSide
8282
uses: actions/[email protected]
8383
with:
8484
name: ClassifiedAds.BlazorServerSide
85-
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net7.0/publish
85+
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net8.0/publish
8686

8787
- name: Upload ClassifiedAds.BlazorWebAssembly
8888
uses: actions/[email protected]
8989
with:
9090
name: ClassifiedAds.BlazorWebAssembly
91-
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net7.0/publish
91+
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net8.0/publish

src/Monolith/.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ASPNETCORE_ENVIRONMENT="Development"
22
DOTNET_ENVIRONMENT="Development"
33
ConnectionStrings__ClassifiedAds="Server=db;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
4+
ConnectionStrings__IdentityServer_IdentityServer4="Server=db;Database=ClassifiedAds.IdentityServer.IdentityServer4;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
45
MessageBroker__Provider="RabbitMQ"
56
MessageBroker__RabbitMQ__HostName="rabbitmq"
67
MessageBroker__Kafka__BootstrapServers="kafka:9092"
@@ -13,5 +14,5 @@ Storage__Amazon__AccessKeyID="xxx"
1314
Storage__Amazon__SecretAccessKey="xxx"
1415
Storage__Amazon__BucketName="classifiedadds"
1516
Storage__Amazon__RegionEndpoint="ap-southeast-1"
16-
ResourceServer__Endpoint="http://webapi"
17+
ResourceServer__Endpoint="http://webapi:8080"
1718
ResourceServer__PublicEndpoint="http://host.docker.internal:9002"

src/Monolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AnalysisMode>Recommended</AnalysisMode>
66
<AnalysisModeSecurity>All</AnalysisModeSecurity>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
1212
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Monolith/ClassifiedAds.Application/Users/Commands/SyncUsersCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using ClassifiedAds.Domain.IdentityProviders;
22
using ClassifiedAds.Domain.Repositories;
3-
using ClassifiedAds.Infrastructure.IdentityProviders;
43
using System;
54
using System.Linq;
65
using System.Threading;

src/Monolith/ClassifiedAds.ArchTests/ClassifiedAds.ArchTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AnalysisMode>Recommended</AnalysisMode>
66
<AnalysisModeSecurity>All</AnalysisModeSecurity>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1212
<PackageReference Include="NetArchTest.Rules" Version="1.3.2" />
13-
<PackageReference Include="xunit" Version="2.4.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
13+
<PackageReference Include="xunit" Version="2.6.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="3.2.0">
18+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>

src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.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.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AnalysisMode>Recommended</AnalysisMode>
66
<AnalysisModeSecurity>All</AnalysisModeSecurity>
77
<UserSecretsId>2afdbe02-eb10-41d2-8fee-1cb29d0dfffb</UserSecretsId>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
1313
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Monolith/ClassifiedAds.BackgroundServer/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:7.0 AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
22
WORKDIR /ClassifiedAds.Monolith
33

44
# Copy csproj and restore as distinct layers
@@ -28,7 +28,7 @@ COPY . ./
2828
RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -c Release -o out
2929

3030
# Build runtime image
31-
FROM mcr.microsoft.com/dotnet/aspnet:7.0
31+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3232
WORKDIR /ClassifiedAds.Monolith
3333
COPY --from=build-env /ClassifiedAds.Monolith/out .
3434

src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"AllowedHosts": "*",
1414
"MessageBroker": {
15-
"Provider": "Fake",
15+
"Provider": "RabbitMQ",
1616
"RabbitMQ": {
1717
"HostName": "localhost",
1818
"UserName": "guest",

src/Monolith/ClassifiedAds.Blazor.Modules/ClassifiedAds.Blazor.Modules.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AnalysisMode>Recommended</AnalysisMode>
66
<AnalysisModeSecurity>All</AnalysisModeSecurity>
77
</PropertyGroup>
88

99

1010
<ItemGroup>
11-
<PackageReference Include="IdentityModel" Version="6.0.0" />
11+
<PackageReference Include="IdentityModel" Version="6.2.0" />
1212
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.1" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.1" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.1" />
16-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
1717
</ItemGroup>
1818

1919

src/Monolith/ClassifiedAds.BlazorServerSide/ClassifiedAds.BlazorServerSide.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AnalysisMode>Recommended</AnalysisMode>
66
<AnalysisModeSecurity>All</AnalysisModeSecurity>
77
<UserSecretsId>752c7fb1-d2cf-490b-aa64-c3a9ea7b6734</UserSecretsId>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.1" />
12-
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.19.1" />
13-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.31.0" />
15-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
16-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.22.0" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
15+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
16+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)