Skip to content

Commit 6500daa

Browse files
wojteksuwalawojteksuwala
authored
Merge pull request #63 from henriqueholtz/master
Migrate from .NET 7 to .NET 8
2 parents c123a25 + 5d3809e commit 6500daa

38 files changed

Lines changed: 268 additions & 244 deletions

‎AgentPortalApiGateway/AgentPortalApiGateway.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<UserSecretsId>4761b4d0-7f3f-4a3a-b774-89de95b85112</UserSecretsId>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0"/>
10-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4"/>
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3"/>
12-
<PackageReference Include="Ocelot" Version="18.0.0"/>
13-
<PackageReference Include="Ocelot.Cache.CacheManager" Version="18.0.0"/>
14-
<PackageReference Include="Ocelot.Provider.Eureka" Version="18.0.0"/>
15-
<PackageReference Include="Steeltoe.Discovery.Eureka" Version="3.2.3"/>
9+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
12+
<PackageReference Include="Ocelot" Version="23.3.3" />
13+
<PackageReference Include="Ocelot.Cache.CacheManager" Version="23.3.3" />
14+
<PackageReference Include="Ocelot.Provider.Eureka" Version="23.3.3" />
15+
<PackageReference Include="Steeltoe.Discovery.Eureka" Version="3.2.7" />
1616
</ItemGroup>
1717

1818
</Project>

‎AgentPortalApiGateway/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
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
22

33
ENV APP_HOME /opt/app
44
RUN mkdir $APP_HOME
@@ -14,7 +14,7 @@ FROM build AS publish
1414
WORKDIR $APP_HOME
1515
RUN cd $APP_HOME && dotnet publish -c Release -o out
1616

17-
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
17+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
1818
WORKDIR /app
1919
ENV ASPNETCORE_URLS=http://+:8099
2020
ENV ASPNETCORE_ENVIRONMENT=docker

‎AuthService/AuthService.csproj‎

Lines changed: 6 additions & 6 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>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3"/>
9-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0"/>
10-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4"/>
11-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2"/>
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
9+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
1313
</ItemGroup>
1414

1515
</Project>

‎AuthService/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
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
22

33
ENV APP_HOME /opt/app
44
RUN mkdir $APP_HOME
@@ -14,7 +14,7 @@ FROM build AS publish
1414
WORKDIR $APP_HOME
1515
RUN cd $APP_HOME && dotnet publish -c Release -o out
1616

17-
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
17+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
1818
WORKDIR /app
1919
ENV ASPNETCORE_URLS=http://+:6060
2020
COPY --from=publish /opt/app/out ./

‎BlazorWasmClient/BlazorWasmClient.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>disable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Version>1.3</Version>
@@ -16,22 +16,22 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
19-
<PackageReference Include="Blazorise.Charts" Version="1.3.1" />
20-
<PackageReference Include="Blazorise.Components" Version="1.3.1" />
21-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.11" />
22-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.11" />
23-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
24-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.11" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.2" PrivateAssets="all" />
26-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
27-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
19+
<PackageReference Include="Blazorise.Charts" Version="1.5.3" />
20+
<PackageReference Include="Blazorise.Components" Version="1.5.3" />
21+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.6" />
22+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.6" />
23+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
24+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.6" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
26+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
2828
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Blazorise" Version="1.3.*" />
33-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.3.*" />
34-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.*" />
32+
<PackageReference Include="Blazorise" Version="1.5.3" />
33+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.5.3" />
34+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.5.3" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎ChatService.Api/ChatService.Api.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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3"/>
9-
<PackageReference Include="MediatR" Version="12.0.1"/>
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
9+
<PackageReference Include="MediatR" Version="12.3.0" />
1010
</ItemGroup>
1111

1212
</Project>

‎ChatService/ChatService.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3" />
9-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
10-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
11-
<PackageReference Include="MediatR" Version="12.0.1" />
12-
<PackageReference Include="EasyNetQ" Version="7.5.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2"/>
14-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
9+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
11+
<PackageReference Include="MediatR" Version="12.3.0" />
12+
<PackageReference Include="EasyNetQ" Version="7.8.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
14+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎ChatService/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
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
22

33
ENV APP_HOME /opt/app
44
RUN mkdir $APP_HOME
@@ -18,7 +18,7 @@ FROM build AS publish
1818
WORKDIR $APP_HOME/ChatService
1919
RUN dotnet publish -c Release -o out
2020

21-
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
21+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
2222
WORKDIR /app
2323
ENV ASPNETCORE_URLS=http://+:4099
2424
ENV ASPNETCORE_ENVIRONMENT=docker

‎DashboardService.Api/DashboardService.Api.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="MediatR" Version="12.0.1"/>
8+
<PackageReference Include="MediatR" Version="12.3.0" />
99
</ItemGroup>
1010

1111
</Project>

‎DashboardService.Test/DashboardService.Test.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.9.3" />
11-
<PackageReference Include="FluentAssertions" Version="5.10.3"/>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
13-
<PackageReference Include="Testcontainers.Elasticsearch" Version="3.5.0" />
14-
<PackageReference Include="xunit" Version="2.4.2"/>
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"/>
16-
<PackageReference Include="coverlet.collector" Version="3.2.0"/>
11+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
13+
<PackageReference Include="Testcontainers.Elasticsearch" Version="3.9.0" />
14+
<PackageReference Include="xunit" Version="2.8.1" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="coverlet.collector" Version="6.0.2">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
1723
</ItemGroup>
1824

1925
<ItemGroup>
20-
<ProjectReference Include="..\DashboardService.Api\DashboardService.Api.csproj"/>
21-
<ProjectReference Include="..\DashboardService\DashboardService.csproj"/>
26+
<ProjectReference Include="..\DashboardService.Api\DashboardService.Api.csproj" />
27+
<ProjectReference Include="..\DashboardService\DashboardService.csproj" />
2228
</ItemGroup>
2329

2430
</Project>

0 commit comments

Comments
 (0)