From 3c747b9f63a6a86b822f37fa336a00a5647e0edf Mon Sep 17 00:00:00 2001 From: "DESKTOP-CGIK2PI\\Joachim" Date: Fri, 28 Nov 2025 23:19:10 +0100 Subject: [PATCH 1/3] update: upgrade to dotnet 10 --- authserver.sln | 4 ++-- .../AuthServer.TestClient.csproj | 10 +++++----- .../AuthServer.TestIdentityProvider.csproj | 6 +++--- ...cs => 20251119210911_InitialCreate.Designer.cs} | 6 +++--- ..._Initial.cs => 20251119210911_InitialCreate.cs} | 2 +- .../AuthorizationDbContextModelSnapshot.cs | 2 +- src/AuthServer/AuthServer.csproj | 12 ++++++------ .../AuthServer.Tests.Core.csproj | 10 +++++----- .../AuthServer.Tests.IntegrationTest.csproj | 12 ++++++------ .../AuthServer.Tests.UnitTest.csproj | 14 +++++++------- 10 files changed, 39 insertions(+), 39 deletions(-) rename src/AuthServer.TestIdentityProvider/Migrations/{20250823185955_Initial.Designer.cs => 20251119210911_InitialCreate.Designer.cs} (99%) rename src/AuthServer.TestIdentityProvider/Migrations/{20250823185955_Initial.cs => 20251119210911_InitialCreate.cs} (99%) diff --git a/authserver.sln b/authserver.sln index ce3a222a..01a03227 100644 --- a/authserver.sln +++ b/authserver.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11217.181 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer", "src\AuthServer\AuthServer.csproj", "{C98FAAD0-0DBC-42CA-99C2-D5C43D4DF0B6}" EndProject diff --git a/src/AuthServer.TestClient/AuthServer.TestClient.csproj b/src/AuthServer.TestClient/AuthServer.TestClient.csproj index e2634534..946b1d44 100644 --- a/src/AuthServer.TestClient/AuthServer.TestClient.csproj +++ b/src/AuthServer.TestClient/AuthServer.TestClient.csproj @@ -1,16 +1,16 @@ - net8.0 + net10.0 enable enable - - - - + + + + diff --git a/src/AuthServer.TestIdentityProvider/AuthServer.TestIdentityProvider.csproj b/src/AuthServer.TestIdentityProvider/AuthServer.TestIdentityProvider.csproj index 043f9c3f..be335786 100644 --- a/src/AuthServer.TestIdentityProvider/AuthServer.TestIdentityProvider.csproj +++ b/src/AuthServer.TestIdentityProvider/AuthServer.TestIdentityProvider.csproj @@ -1,17 +1,17 @@ - net8.0 + net10.0 enable enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/AuthServer.TestIdentityProvider/Migrations/20250823185955_Initial.Designer.cs b/src/AuthServer.TestIdentityProvider/Migrations/20251119210911_InitialCreate.Designer.cs similarity index 99% rename from src/AuthServer.TestIdentityProvider/Migrations/20250823185955_Initial.Designer.cs rename to src/AuthServer.TestIdentityProvider/Migrations/20251119210911_InitialCreate.Designer.cs index 76e38379..98d285d7 100644 --- a/src/AuthServer.TestIdentityProvider/Migrations/20250823185955_Initial.Designer.cs +++ b/src/AuthServer.TestIdentityProvider/Migrations/20251119210911_InitialCreate.Designer.cs @@ -12,15 +12,15 @@ namespace AuthServer.TestIdentityProvider.Migrations { [DbContext(typeof(AuthorizationDbContext))] - [Migration("20250823185955_Initial")] - partial class Initial + [Migration("20251119210911_InitialCreate")] + partial class InitialCreate { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.11") + .HasAnnotation("ProductVersion", "10.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/src/AuthServer.TestIdentityProvider/Migrations/20250823185955_Initial.cs b/src/AuthServer.TestIdentityProvider/Migrations/20251119210911_InitialCreate.cs similarity index 99% rename from src/AuthServer.TestIdentityProvider/Migrations/20250823185955_Initial.cs rename to src/AuthServer.TestIdentityProvider/Migrations/20251119210911_InitialCreate.cs index 28e7f82d..a4d3573d 100644 --- a/src/AuthServer.TestIdentityProvider/Migrations/20250823185955_Initial.cs +++ b/src/AuthServer.TestIdentityProvider/Migrations/20251119210911_InitialCreate.cs @@ -8,7 +8,7 @@ namespace AuthServer.TestIdentityProvider.Migrations { /// - public partial class Initial : Migration + public partial class InitialCreate : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/AuthServer.TestIdentityProvider/Migrations/AuthorizationDbContextModelSnapshot.cs b/src/AuthServer.TestIdentityProvider/Migrations/AuthorizationDbContextModelSnapshot.cs index 240fb7dd..53fb1dbd 100644 --- a/src/AuthServer.TestIdentityProvider/Migrations/AuthorizationDbContextModelSnapshot.cs +++ b/src/AuthServer.TestIdentityProvider/Migrations/AuthorizationDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.11") + .HasAnnotation("ProductVersion", "10.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/src/AuthServer/AuthServer.csproj b/src/AuthServer/AuthServer.csproj index 9923c81f..f9a182a0 100644 --- a/src/AuthServer/AuthServer.csproj +++ b/src/AuthServer/AuthServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 latestMajor enable enable @@ -25,11 +25,11 @@ - - - - - + + + + + diff --git a/tests/AuthServer.Tests.Core/AuthServer.Tests.Core.csproj b/tests/AuthServer.Tests.Core/AuthServer.Tests.Core.csproj index c656cdf2..623b3658 100644 --- a/tests/AuthServer.Tests.Core/AuthServer.Tests.Core.csproj +++ b/tests/AuthServer.Tests.Core/AuthServer.Tests.Core.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,14 +10,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/AuthServer.Tests.IntegrationTest/AuthServer.Tests.IntegrationTest.csproj b/tests/AuthServer.Tests.IntegrationTest/AuthServer.Tests.IntegrationTest.csproj index 364b479b..b3fc17f6 100644 --- a/tests/AuthServer.Tests.IntegrationTest/AuthServer.Tests.IntegrationTest.csproj +++ b/tests/AuthServer.Tests.IntegrationTest/AuthServer.Tests.IntegrationTest.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,14 +10,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/AuthServer.Tests.UnitTest/AuthServer.Tests.UnitTest.csproj b/tests/AuthServer.Tests.UnitTest/AuthServer.Tests.UnitTest.csproj index 042fa380..8a5e511d 100644 --- a/tests/AuthServer.Tests.UnitTest/AuthServer.Tests.UnitTest.csproj +++ b/tests/AuthServer.Tests.UnitTest/AuthServer.Tests.UnitTest.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,16 +10,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 3575942f5f1e8df29d8e23e5c365fc391f175cbb Mon Sep 17 00:00:00 2001 From: "DESKTOP-CGIK2PI\\Joachim" Date: Fri, 28 Nov 2025 23:19:39 +0100 Subject: [PATCH 2/3] update: set device authorization module as a singleton --- src/AuthServer/Extensions/AuthServerBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AuthServer/Extensions/AuthServerBuilder.cs b/src/AuthServer/Extensions/AuthServerBuilder.cs index c87ca9d7..2064fea2 100644 --- a/src/AuthServer/Extensions/AuthServerBuilder.cs +++ b/src/AuthServer/Extensions/AuthServerBuilder.cs @@ -380,7 +380,7 @@ public AuthServerBuilder AddDeviceCode() _services .AddScoped, DeviceAuthorizationRequestAccessor>() .AddKeyedScoped(EndpointNameConstants.DeviceAuthorization) - .AddScoped() + .AddSingleton() .AddScoped, DeviceAuthorizationRequestHandler>() .AddScoped, DeviceAuthorizationRequestValidator>() .AddScoped, DeviceAuthorizationRequestProcessor>(); From c36df83637a8e63424c25f1fbedf8eb7cc40ff07 Mon Sep 17 00:00:00 2001 From: "DESKTOP-CGIK2PI\\Joachim" Date: Sun, 30 Nov 2025 11:20:55 +0100 Subject: [PATCH 3/3] update: workflows to use dotnet 10 --- .github/workflows/build.yml | 2 +- .github/workflows/deploy_nuget.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee01abfe..32241692 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Install tools run: | dotnet tool install --global dotnet-coverage diff --git a/.github/workflows/deploy_nuget.yml b/.github/workflows/deploy_nuget.yml index a8e5f7c2..a295cf71 100644 --- a/.github/workflows/deploy_nuget.yml +++ b/.github/workflows/deploy_nuget.yml @@ -46,7 +46,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Restore run: dotnet restore authserver.sln