Skip to content

Upgrade to .NET 9 and update related configurations #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 10 commits into from
Jun 4, 2025
Merged

Upgrade to .NET 9 and update related configurations #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8fa7cf2
Upgrade to .NET 9 and update related configurations
StuartFerguson Jun 3, 2025
913dd28
Upgrade .NET images to version 9.0
StuartFerguson Jun 3, 2025
8bfaf50
Update project file to target a single framework
StuartFerguson Jun 3, 2025
3932b3f
merge with master
StuartFerguson Jun 3, 2025
f8a2ce1
:|
StuartFerguson Jun 3, 2025
e95333e
Remove MySQL package and enhance logging features
StuartFerguson Jun 4, 2025
0bf0946
:|
StuartFerguson Jun 4, 2025
2653cec
Enhance logging and improve database connection handling
StuartFerguson Jun 4, 2025
e14acdf
Enable headless mode for Chrome in integration tests
StuartFerguson Jun 4, 2025
113612a
Add connection strings for database contexts
StuartFerguson Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/buildwindowsimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Get the version
id: get_version
uses: battila7/get-version-action@v2
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/createrelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:

steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Get the version
id: get_version
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/nightlybuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Set Up Variables
run: echo "action_url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV

Expand All @@ -35,12 +40,7 @@ jobs:

openssl pkcs12 -in "$certPath" -out temp.pem -nodes -password "pass:$password"
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
with:
dotnet-version: '8.0.x'
sudo update-ca-certificates

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down Expand Up @@ -107,11 +107,11 @@ jobs:
openssl pkcs12 -in "$certPath" -out temp.pem -nodes -password "pass:$password"
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates
- name: Install NET 8
uses: actions/setup-dotnet@v2

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down Expand Up @@ -176,11 +176,11 @@ jobs:
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

Expand Down Expand Up @@ -248,11 +248,11 @@ jobs:
openssl pkcs12 -in "$certPath" -out temp.pem -nodes -password "pass:$password"
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down Expand Up @@ -298,10 +298,10 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 8
uses: actions/setup-dotnet@v2
- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Trust Root Certificate
run: |
certPath="$GITHUB_WORKSPACE/Certificates/aspnetapp-root-cert.pfx"
Expand All @@ -33,11 +38,6 @@ jobs:
openssl pkcs12 -in "$certPath" -out temp.pem -nodes -password "pass:$password"
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
with:
dotnet-version: '8.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down Expand Up @@ -93,10 +93,10 @@ jobs:
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down Expand Up @@ -150,10 +150,10 @@ jobs:
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down Expand Up @@ -207,10 +207,10 @@ jobs:
sudo cp temp.pem /usr/local/share/ca-certificates/aspnetapp-web-api.crt
sudo update-ca-certificates

- name: Install NET 8
uses: actions/setup-dotnet@v2
- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pushtomaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
with:
fetch-depth: 0

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

Expand Down
6 changes: 5 additions & 1 deletion SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,16 @@

public async Task<Result<ChangeUserPasswordResult>> Handle(SecurityServiceCommands.ChangeUserPasswordCommand command, CancellationToken cancellationToken){

//Logger.LogWarning("In Handle ChangeUserPasswordCommand");

Check warning on line 256 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs#L256 

Remove this commented out code.
// Find the user based on the user name passed in
ApplicationUser user = await this.UserManager.FindByNameAsync(command.UserName);

if (user == null){
//Logger.LogWarning("In Handle ChangeUserPasswordCommand - user is null");

Check warning on line 261 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs#L261 

Remove this commented out code.
// this prevents giving away info to a potential hacker...
return Result.NotFound();
}

//Logger.LogWarning("In Handle ChangeUserPasswordCommand - user is not null");

Check warning on line 265 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs#L265 

Remove this commented out code.
IdentityResult result = await this.UserManager.ChangePasswordAsync(user,
command.CurrentPassword,
command.NewPassword);
Expand All @@ -275,10 +277,12 @@
return Result.Failure($"Errors during password change for user [{command.UserName} and Client [{command.ClientId}]");
}

//Logger.LogWarning("In Handle ChangeUserPasswordCommand - password changed");

Check warning on line 280 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs#L280 

Remove this commented out code.
// build the redirect uri
Client client = await this.ConfigurationDbContext.Clients.SingleOrDefaultAsync(c => c.ClientId == command.ClientId, cancellationToken:cancellationToken);

if (client == null){
//Logger.LogWarning("In Handle ChangeUserPasswordCommand - client not found");

Check warning on line 285 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs#L285 

Remove this commented out code.
Logger.LogInformation($"Client not found for clientId {command.ClientId}");
return Result.Invalid($"Client not found for clientId {command.ClientId}");
}
Expand Down
26 changes: 13 additions & 13 deletions SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Duende.IdentityServer" Version="7.0.8" />
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.0.8" />
<PackageReference Include="Duende.IdentityServer.Storage" Version="7.0.8" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="MessagingService.Client" Version="2024.12.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.14" />
<PackageReference Include="Duende.IdentityServer" Version="7.2.3" />
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.2.3" />
<PackageReference Include="Duende.IdentityServer.Storage" Version="7.2.3" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="MessagingService.Client" Version="2025.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.14" />
<PackageReference Include="Shared" Version="2025.5.4" />
<PackageReference Include="Shared.Results" Version="2025.5.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.5" />
<PackageReference Include="Shared" Version="2025.6.1" />
<PackageReference Include="Shared.Results" Version="2025.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions SecurityService.Client/SecurityService.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets</TargetsForTfmSpecificBuildOutput>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.4" />
<PackageReference Include="Shared.Results" Version="2025.5.4" />
<PackageReference Include="ClientProxyBase" Version="2025.6.1" />
<PackageReference Include="Shared.Results" Version="2025.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SecurityService.DataTransferObjects/SecurityService.DataTransferObjects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
24 changes: 12 additions & 12 deletions SecurityService.Database/SecurityService.Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<DebugType>None</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.8" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.14">
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.2.3" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.14">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Shared" Version="2025.5.4" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
<PackageReference Include="Shared" Version="2025.6.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="DbContexts\" />
Expand Down
6 changes: 3 additions & 3 deletions SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand All @@ -18,8 +18,8 @@
<!--<PackageReference Include="Reqnroll" Version="1.0.1" />-->
<!--<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
<PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />-->
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.5.4" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
<!--<PackageReference Include="Shouldly" Version="4.2.1" />-->
<!--<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
Expand Down
Loading
Loading