Merge pull request #30 from DuendeSoftware/dh/im-drop-net6

IdentityModel - drop support for `net6.0` and add `net9.0` to tests
DuendeSoftware · Nov 12, 2024 · 75ea566 · 75ea566
2 parents 9d253ff + 7c9ab6c
commit 75ea566
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 2,803 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -22,6 +22,13 @@
     <IdentityServerVersion>7.0.8</IdentityServerVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0'">
+    <FrameworkVersion>9.0.0</FrameworkVersion>
+    <ExtensionsVersion>9.0.0</ExtensionsVersion>
+    <WilsonVersion>8.0.0</WilsonVersion>
+    <IdentityServerVersion>7.0.8</IdentityServerVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
     <PackageVersion Include="BullsEye" Version="5.0.0" />

diff --git a/identity-model/global.json b/identity-model/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }
diff --git a/identity-model/src/IdentityModel/IdentityModel.csproj b/identity-model/src/IdentityModel/IdentityModel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <AssemblyName>Duende.IdentityModel</AssemblyName>
     <RootNamespace>Duende.IdentityModel</RootNamespace>
     <Description>OpenID Connect &amp; OAuth 2.0 client library</Description>

diff --git a/identity-model/test/IdentityModel.Tests/IdentityModel.Tests.csproj b/identity-model/test/IdentityModel.Tests/IdentityModel.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <RootNamespace>Duende.IdentityModel</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>

diff --git a/...del.Tests/Verifications/PublicApiVerificationTests.VerifyPublicApi.DotNet8_0.verified.txt b/...del.Tests/Verifications/PublicApiVerificationTests.VerifyPublicApi.DotNet8_0.verified.txt
diff --git a/...yModel.Tests/Verifications/PublicApiVerificationTests.VerifyPublicApi.Net4_8.verified.txt b/...yModel.Tests/Verifications/PublicApiVerificationTests.VerifyPublicApi.Net4_8.verified.txt
diff --git a/...ts.VerifyPublicApi.DotNet6_0.verified.txt → ...icationTests.VerifyPublicApi.verified.txt b/...ts.VerifyPublicApi.DotNet6_0.verified.txt → ...icationTests.VerifyPublicApi.verified.txt
diff --git a/identity-model/test/IdentityModel.Tests/Verifications/PublicApiVerificationTests.cs b/identity-model/test/IdentityModel.Tests/Verifications/PublicApiVerificationTests.cs
@@ -7,6 +7,7 @@ namespace Duende.IdentityModel.Verifications;
 
 public class PublicApiVerificationTests
 {
+#if NET8_0
     [Fact]
     public async Task VerifyPublicApi()
     {
@@ -16,7 +17,7 @@ public async Task VerifyPublicApi()
         };
         var publicApi = typeof(JwtClaimTypes).Assembly.GeneratePublicApi(apiGeneratorOptions);
         var settings = new VerifySettings();
-        settings.UniqueForTargetFrameworkAndVersion();
         await Verify(publicApi, settings);
     }
+#endif
 }