Skip to content

Commit d0f97fc

Browse files
cdavernascdavernas
authored
Merge pull request #453 from serverlessworkflow/feat-net9
Upgraded solution to NET 9.0
2 parents ff53a45 + d95aeb5 commit d0f97fc

File tree

31 files changed

+136
-179
lines changed

31 files changed

+136
-179
lines changed

‎.github/workflows/build-dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
dotnet-version: ['8.0.x' ]
18+
dotnet-version: ['9.0.x' ]
1919

2020
steps:
2121
- name: Checkout

‎.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎.github/workflows/publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v1
1919
with:
20-
dotnet-version: 8.0.x
20+
dotnet-version: 9.0.x
2121
- name: Restore dependencies
2222
run: dotnet restore "./Synapse.sln"
2323
- name: Build
@@ -159,7 +159,7 @@ jobs:
159159
- name: Setup
160160
uses: actions/setup-dotnet@v2
161161
with:
162-
dotnet-version: 8.0.x
162+
dotnet-version: 9.0.x
163163
- name: Restore
164164
run: dotnet restore
165165
- name: Build
@@ -208,7 +208,7 @@ jobs:
208208
- name: Setup
209209
uses: actions/setup-dotnet@v2
210210
with:
211-
dotnet-version: 8.0.x
211+
dotnet-version: 9.0.x
212212
- name: Restore
213213
run: dotnet restore
214214
- name: Build
@@ -257,7 +257,7 @@ jobs:
257257
- name: Setup
258258
uses: actions/setup-dotnet@v2
259259
with:
260-
dotnet-version: 8.0.x
260+
dotnet-version: 9.0.x
261261
- name: Restore
262262
run: dotnet restore
263263
- name: Build
@@ -306,7 +306,7 @@ jobs:
306306
- name: Setup
307307
uses: actions/setup-dotnet@v2
308308
with:
309-
dotnet-version: 8.0.x
309+
dotnet-version: 9.0.x
310310
- name: Restore
311311
run: dotnet restore
312312
- name: Build
@@ -355,7 +355,7 @@ jobs:
355355
- name: Setup
356356
uses: actions/setup-dotnet@v2
357357
with:
358-
dotnet-version: 8.0.x
358+
dotnet-version: 9.0.x
359359
- name: Restore
360360
run: dotnet restore
361361
- name: Build

‎src/api/Synapse.Api.Application/Synapse.Api.Application.csproj

Lines changed: 2 additions & 2 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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>
@@ -44,7 +44,7 @@
4444
<ItemGroup>
4545
<PackageReference Include="IdentityServer4" Version="4.1.2" NoWarn="NU1902" />
4646
<PackageReference Include="IdentityServer4.Storage" Version="4.1.2" NoWarn="NU1902" />
47-
<PackageReference Include="Polly" Version="8.4.2" />
47+
<PackageReference Include="Polly" Version="8.5.0" />
4848
</ItemGroup>
4949

5050
<ItemGroup>

‎src/api/Synapse.Api.Client.Core/Synapse.Api.Client.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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>

‎src/api/Synapse.Api.Client.Http/Synapse.Api.Client.Http.csproj

Lines changed: 2 additions & 2 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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>
@@ -42,7 +42,7 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.10" />
45+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
4646
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha5.1" />
4747
<PackageReference Include="System.Reactive" Version="6.0.1" />
4848
</ItemGroup>

‎src/api/Synapse.Api.Http/Synapse.Api.Http.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>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>
@@ -43,9 +43,9 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.8" />
47-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.8" />
48-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
46+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.16.0" />
47+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.16.0" />
48+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.0.0" />
4949
</ItemGroup>
5050

5151
<ItemGroup>

‎src/api/Synapse.Api.Server/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
22
USER app
33
WORKDIR /app
44
EXPOSE 8080
55

6-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
77
ARG BUILD_CONFIGURATION=Release
88
WORKDIR /src
99
COPY ["README.md", "README.md"]

‎src/api/Synapse.Api.Server/Synapse.Api.Server.csproj

Lines changed: 6 additions & 5 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>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>
@@ -27,14 +27,15 @@
2727
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
2828
<DockerfileContext>..\..\..</DockerfileContext>
2929
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
30+
<CETCompat>false</CETCompat>
3031
</PropertyGroup>
3132

3233
<ItemGroup>
33-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
34-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
35-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
34+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
35+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
3637
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
37-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
38+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.0.0" />
3839
</ItemGroup>
3940

4041
<ItemGroup>

‎src/cli/Synapse.Cli/Synapse.Cli.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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<OutputType>Exe</OutputType>
@@ -29,8 +29,8 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
3434
<PackageReference Include="moment.net" Version="1.3.4" />
3535
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
3636
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha5.1" />

‎src/core/Synapse.Core.Infrastructure.Containers.Docker/Synapse.Core.Infrastructure.Containers.Docker.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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>

‎src/core/Synapse.Core.Infrastructure.Containers.Kubernetes/Synapse.Core.Infrastructure.Containers.Kubernetes.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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>

‎src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj

Lines changed: 7 additions & 7 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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>
@@ -44,12 +44,12 @@
4444

4545
<ItemGroup>
4646
<PackageReference Include="IdentityModel" Version="7.0.0" />
47-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
48-
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.15.8" />
49-
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.15.8" />
50-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.15.8" />
51-
<PackageReference Include="Neuroglia.Mediation" Version="4.15.8" />
52-
<PackageReference Include="Neuroglia.Plugins" Version="4.15.8" />
47+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
48+
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.16.0" />
49+
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.16.0" />
50+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.16.0" />
51+
<PackageReference Include="Neuroglia.Mediation" Version="4.16.0" />
52+
<PackageReference Include="Neuroglia.Plugins" Version="4.16.0" />
5353
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha5.1" />
5454
</ItemGroup>
5555

‎src/core/Synapse.Core/Synapse.Core.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>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NeutralLanguage>en</NeutralLanguage>
@@ -66,9 +66,9 @@
6666
<ItemGroup>
6767
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
6868
<PackageReference Include="KubernetesClient" Version="15.0.1" />
69-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.15.8" />
70-
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.15.8" />
71-
<PackageReference Include="Semver" Version="2.3.0" />
69+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.16.0" />
70+
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.16.0" />
71+
<PackageReference Include="Semver" Version="3.0.0" />
7272
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha5.1" />
7373
</ItemGroup>
7474

‎src/correlator/Synapse.Correlator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
22
USER root
33
RUN apt-get update
44
RUN apt-get install -y jq
55
USER app
66
WORKDIR /app
77
EXPOSE 8080
88

9-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
9+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1010
ARG BUILD_CONFIGURATION=Release
1111
WORKDIR /src
1212
COPY ["README.md", "README.md"]

‎src/correlator/Synapse.Correlator/Synapse.Correlator.csproj

Lines changed: 12 additions & 11 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>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<OutputType>Exe</OutputType>
@@ -29,20 +29,21 @@
2929
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
3030
<DockerfileContext>..\..\..</DockerfileContext>
3131
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
32+
<CETCompat>false</CETCompat>
3233
</PropertyGroup>
3334

3435
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="8.0.10" />
36-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="9.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
3738
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
38-
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.15.8" />
39-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.8" />
40-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.15.8" />
41-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.8" />
42-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.15.8" />
43-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.8" />
44-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
45-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
39+
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.16.0" />
40+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.16.0" />
41+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.16.0" />
42+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.16.0" />
43+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.16.0" />
44+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.16.0" />
45+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.0.0" />
46+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.0.0" />
4647
</ItemGroup>
4748

4849
<ItemGroup>

0 commit comments

Comments
 (0)