8000 Update to .NET 9 by cnblogs-dudu · Pull Request #5 · cnblogs/IdentityServer4 · GitHub
[go: up one dir, main page]
Skip to content

Update to .NET 9 #5

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
merged 22 commits into from
May 2, 2025
Merged

Update to .NET 9 #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2305ee2
chore(deps): update TargetFramework to net9.0
cnblogs-dudu Apr 30, 2025
05778f6
build: update global.json
cnblogs-dudu Apr 30, 2025
d1940b1
chore(desp): update packages version in Directory.Build.targets
cnblogs-dudu May 1, 2025
3f03417
fix: use IReadOnlyCollection instead
cnblogs-dudu May 1, 2025
7dfa549
chore(deps): update pacakges
cnblogs-dudu May 1, 2025
1f74be0
fix: use IReadOnlyCollection instead
cnblogs-dudu May 1, 2025
86634c2
chore(deps): update packages
cnblogs-dudu May 1, 2025
f28f82f
chore(deps): update packages
cnblogs-dudu May 1, 2025
26c45e5
fix: use news FluentAssertions apis
cnblogs-dudu May 1, 2025
5d00c32
fix: changes for Bullseye update
cnblogs-dudu May 1, 2025
40a7f4a
ci: use dotnet 9
cnblogs-dudu May 1, 2025
68fc729
chore(deps): rename IdentityModel to Duende.IdentityModel
cnblogs-dudu May 1, 2025
6cd7977
chore: change IdentityServerVersion to 4.3.0
cnblogs-dudu May 1, 2025
248a9ca
refactor: use Duende.IdentityModel.Client
cnblogs-dudu May 2, 2025
c4af605
test: shet ShowPII to true
cnblogs-dudu May 2, 2025
75f4698
fix(test): remove extra comma in json
cnblogs-dudu May 2 8000 , 2025
29cf3c2
fix(test): use double quote in json
cnblogs-dudu May 2, 2025
1d15407
refactor: use JsonSerializer of System.Text.Json
cnblogs-dudu May 2, 2025
466ef5e
test: remove a test for changes of System.IdentityModel.Tokens.Jwt
cnblogs-dudu May 2, 2025
bb2e602
test: remove a test align with Duende.IdentityModel.Client
cnblogs-dudu May 2, 2025
02d4583
refactor: use Duende.IdentityModel
cnblogs-dudu May 2, 2025
cf8e784
chore(deps): update samples to .net 9
cnblogs-dudu May 2, 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
Next Next commit
chore(deps): update TargetFramework to net9.0
  • Loading branch information
@cnblogs-dudu
cnblogs-dudu committed Apr 30, 2025
commit 2305ee27681cf34ec025b2a92e93b99c2c1f525c
6 changes: 3 additions & 3 deletions src/AspNetIdentity/build/build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,5 +13,5 @@
<PackageReference Include="Bullseye" />
<PackageReference Include="SimpleExec" />
</ItemGroup>
</Project>

</Project>
4 changes: 2 additions & 2 deletions src/AspNetIdentity/host/Host.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.Web">

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

<ItemGroup>
Expand All @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="System.Security.Principal.Windows" />

<ProjectReference Include="..\src\IdentityServer4.AspNetIdentity.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/AspNetIdentity/migrations/SqlServer/SqlServer.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.Web">

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

<ItemGroup>
Expand All @@ -13,4 +13,4 @@
<ProjectReference Include="..\..\src\IdentityServer4.AspNetIdentity.csproj" />
</ItemGroup>

</Project>
</Project>
5 changes: 3 additions & 2 deletions src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>Cnblogs.IdentityServer4.AspNetIdentity</PackageId>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>

<Description>ASP.NET Core Identity Integration for IdentityServer4</Description>
<Authors>Brock Allen;Dominick Baier</Authors>
Expand All @@ -15,7 +15,8 @@

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<AllowedOutputExtensionsInPackageBuildOutputFolder>
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

<AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
9E19 Expand Down
139 changes: 80 additions & 59 deletions src/Directory.Build.targets
View file
Open in desktop
F438
Original file line number Diff line number Diff line change
@@ -1,69 +1,90 @@
<Project>

<PropertyGroup>
<FrameworkVersion>7.0.0</FrameworkVersion>
<ExtensionsVersion>7.0.0</ExtensionsVersion>
<EntityFrameworkVersion>7.0.0</EntityFrameworkVersion>
<IdentityServerVersion>4.2.0</IdentityServerVersion>
</PropertyGroup>
<PropertyGroup>
<FrameworkVersion>9.0.0</FrameworkVersion>
<ExtensionsVersion>9.0.0</ExtensionsVersion>
<EntityFrameworkVersion>9.0.0</EntityFrameworkVersion>
<IdentityServerVersion>4.2.0</IdentityServerVersion>
</PropertyGroup>

<ItemGroup>
<!--build related-->
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
<PackageReference Update="SimpleExec" Version="11.0.0" />
<PackageReference Update="Bullseye" Version="4.2.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<ItemGroup>
<!--build
related-->
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
<PackageReference Update="SimpleExec" Version="11.0.0" />
<PackageReference Update="Bullseye" Version="4.2.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

<!--tests -->
<PackageReference Update="FluentAssertions" Version="6.8.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Update="xunit" Version="2.4.2" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
<!--tests -->
<PackageReference Update="FluentAssertions" Version="6.8.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Update="xunit" Version="2.4.2" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />

<!--our stuff -->
<PackageReference Update="IdentityModel" Version="6.0.0" />
<!--our
stuff -->
<PackageReference Update="IdentityModel" Version="6.0.0" />

<PackageReference Update="Cnblogs.IdentityServer4" Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.AspNetIdentity" Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.Storage" Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework.Storage" Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework" Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4" Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.AspNetIdentity"
Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.Storage"
Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework.Storage"
Version="$(IdentityServerVersion)" />
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework"
Version="$(IdentityServerVersion)" />

<!--microsoft extensions -->
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(ExtensionsVersion)" />

<!--misc -->
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.25.0" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
<PackageReference Update="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Update="AutoMapper" Version="12.0.0" />

<!--microsoft asp.net core -->
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(FrameworkVersion)"/>

<!--microsoft entity framework -->
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All" />
<!--microsoft
extensions -->
<PackageReference Update="Microsoft.Extensions.Caching.Memory"
Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Logging.Console"
Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions"
Version="$(ExtensionsVersion)" />

</ItemGroup>
<!--misc -->
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.25.0" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
<PackageReference Update="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Update="AutoMapper" Version="12.0.0" />

<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
<PropertyGroup>
<AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
</PropertyGroup>
</Target>
<!--microsoft
asp.net core -->
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect"
Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore"
Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson"
Version="$(FrameworkVersion)" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate"
Version="$(FrameworkVersion)" />

<!--microsoft
entity framework -->
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational"
Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite"
Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory"
Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer"
Version="$(EntityFrameworkVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Design"
Version="$(EntityFrameworkVersion)" PrivateAssets="All" />

</ItemGroup>

<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
<PropertyGroup>
<AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
</PropertyGroup>
</Target>
</Project>
6 changes: 3 additions & 3 deletions src/EntityFramework.Storage/build/build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,5 +13,5 @@
<PackageReference Include="Bullseye" />
<PackageReference Include="SimpleExec" />
</ItemGroup>
</Project>

</Project>
4 changes: 2 additions & 2 deletions src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -14,4 +14,4 @@
<ProjectReference Include="..\..\src\IdentityServer4.EntityFramework.Storage.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions src/EntityFramework.Storage/migrations/SqlServer/SqlServer.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.Web">

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<ProjectReference Include="..\..\src\IdentityServer4.EntityFramework.Storage.csproj" />
</ItemGroup>

</Project>
15 changes: 8 additions & 7 deletions src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<PackageId>Cnblogs.IdentityServer4.EntityFramework.Storage</PackageId>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>

<Description>EntityFramework persistence layer for IdentityServer4</Description>
<Authors>Brock Allen;Dominick Baier;Scott Brady</Authors>
<PackageTags>OAuth2;OAuth 2.0;OpenID Connect;Security;Identity;IdentityServer;EntityFramework</PackageTags>
Expand All @@ -12,10 +12,11 @@
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageReleaseNotes>https://github.com/cnblogs/IdentityServer4/releases</PackageReleaseNotes>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<AllowedOutputExtensionsInPackageBuildOutputFolder>
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

<AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -30,14 +31,14 @@
<ItemGroup>
<None Include="../../../icon.jpg" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Cnblogs.IdentityServer4.Storage" />

<PackageReference Include="AutoMapper" />

<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>

</Project>
</Project>
8 changes: 4 additions & 4 deletions ...ork.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.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>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>

<AssemblyOriginatorKeyFile>../../../../key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -11,20 +11,20 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\IdentityServer4.EntityFramework.Storage.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Cnblogs.IdentityServer4" />
<PackageReference Include="Cnblogs.IdentityServer4.Storage" />

<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="FluentAssertions" />

<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
Expand Down
6 changes: 3 additions & 3 deletions src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.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>net7.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>

<AssemblyOriginatorKeyFile>../../../../key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -17,8 +17,8 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />

<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
</ItemGroup>

</Project>
</Project>
6 changes: 3 additions & 3 deletions src/EntityFramework/build/build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,5 +13,5 @@
<PackageReference Include="Bullseye" />
<PackageReference Include="SimpleExec" />
</ItemGroup>
</Project>

</Project>
Loading
0