Skip to content

Commit 2305ee2

Browse files
cnblogs-duducnblogs-dudu
committed
chore(deps): update TargetFramework to net9.0
1 parent fe637e8 commit 2305ee2

File tree

23 files changed

+149
-123
lines changed

23 files changed

+149
-123
lines changed

‎src/AspNetIdentity/build/build.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -13,5 +13,5 @@
1313
<PackageReference Include="Bullseye" />
1414
<PackageReference Include="SimpleExec" />
1515
</ItemGroup>
16-
17-
</Project>
16+
17+
</Project>

‎src/AspNetIdentity/host/Host.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
1717
<PackageReference Include="System.Security.Principal.Windows" />
18-
18+
1919
<ProjectReference Include="..\src\IdentityServer4.AspNetIdentity.csproj" />
2020
</ItemGroup>
2121

‎src/AspNetIdentity/migrations/SqlServer/SqlServer.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -13,4 +13,4 @@
1313
<ProjectReference Include="..\..\src\IdentityServer4.AspNetIdentity.csproj" />
1414
</ItemGroup>
1515

16-
</Project>
16+
</Project>

‎src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<PackageId>Cnblogs.IdentityServer4.AspNetIdentity</PackageId>
5-
<TargetFrameworks>net7.0</TargetFrameworks>
5+
<TargetFrameworks>net9.0</TargetFrameworks>
66

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

1616
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1717
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
18+
<AllowedOutputExtensionsInPackageBuildOutputFolder>
19+
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
1920

2021
<AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
2122
<SignAssembly>true</SignAssembly>

‎src/Directory.Build.targets‎

Lines changed: 80 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,90 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<FrameworkVersion>7.0.0</FrameworkVersion>
5-
<ExtensionsVersion>7.0.0</ExtensionsVersion>
6-
<EntityFrameworkVersion>7.0.0</EntityFrameworkVersion>
7-
<IdentityServerVersion>4.2.0</IdentityServerVersion>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<FrameworkVersion>9.0.0</FrameworkVersion>
5+
<ExtensionsVersion>9.0.0</ExtensionsVersion>
6+
<EntityFrameworkVersion>9.0.0</EntityFrameworkVersion>
7+
<IdentityServerVersion>4.2.0</IdentityServerVersion>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<!--build related-->
12-
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
13-
<PackageReference Update="SimpleExec" Version="11.0.0" />
14-
<PackageReference Update="Bullseye" Version="4.2.0" />
15-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
10+
<ItemGroup>
11+
<!--build
12+
related-->
13+
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
14+
<PackageReference Update="SimpleExec" Version="11.0.0" />
15+
<PackageReference Update="Bullseye" Version="4.2.0" />
16+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1617

17-
<!--tests -->
18-
<PackageReference Update="FluentAssertions" Version="6.8.0" />
19-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.0" />
20-
<PackageReference Update="xunit" Version="2.4.2" />
21-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
18+
<!--tests -->
19+
<PackageReference Update="FluentAssertions" Version="6.8.0" />
20+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.0" />
21+
<PackageReference Update="xunit" Version="2.4.2" />
22+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
2223

23-
<!--our stuff -->
24-
<PackageReference Update="IdentityModel" Version="6.0.0" />
24+
<!--our
25+
stuff -->
26+
<PackageReference Update="IdentityModel" Version="6.0.0" />
2527

26-
<PackageReference Update="Cnblogs.IdentityServer4" Version="$(IdentityServerVersion)" />
27-
<PackageReference Update="Cnblogs.IdentityServer4.AspNetIdentity" Version="$(IdentityServerVersion)" />
28-
<PackageReference Update="Cnblogs.IdentityServer4.Storage" Version="$(IdentityServerVersion)" />
29-
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework.Storage" Version="$(IdentityServerVersion)" />
30-
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework" Version="$(IdentityServerVersion)" />
28+
<PackageReference Update="Cnblogs.IdentityServer4" Version="$(IdentityServerVersion)" />
29+
<PackageReference Update="Cnblogs.IdentityServer4.AspNetIdentity"
30+
Version="$(IdentityServerVersion)" />
31+
<PackageReference Update="Cnblogs.IdentityServer4.Storage"
32+
Version="$(IdentityServerVersion)" />
33+
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework.Storage"
34+
Version="$(IdentityServerVersion)" />
35+
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework"
36+
Version="$(IdentityServerVersion)" />
3137

32-
<!--microsoft extensions -->
33-
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)" />
34-
<PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
35-
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
36-
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
37-
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(ExtensionsVersion)" />
38-
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(ExtensionsVersion)" />
39-
40-
<!--misc -->
41-
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
42-
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.25.0" />
43-
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
44-
<PackageReference Update="System.Security.Principal.Windows" Version="5.0.0" />
45-
<PackageReference Update="AutoMapper" Version="12.0.0" />
46-
47-
<!--microsoft asp.net core -->
48-
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
49-
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
50-
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)" />
51-
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(FrameworkVersion)" />
52-
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(FrameworkVersion)" />
53-
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(FrameworkVersion)"/>
54-
55-
<!--microsoft entity framework -->
56-
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkVersion)" />
57-
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
58-
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkVersion)" />
59-
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkVersion)" />
60-
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All" />
38+
<!--microsoft
39+
extensions -->
40+
<PackageReference Update="Microsoft.Extensions.Caching.Memory"
41+
Version="$(ExtensionsVersion)" />
42+
<PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
43+
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
44+
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
45+
<PackageReference Update="Microsoft.Extensions.Logging.Console"
46+
Version="$(ExtensionsVersion)" />
47+
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions"
48+
Version="$(ExtensionsVersion)" />
6149

62-
</ItemGroup>
50+
<!--misc -->
51+
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
52+
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.25.0" />
53+
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
54+
<PackageReference Update="System.Security.Principal.Windows" Version="5.0.0" />
55+
<PackageReference Update="AutoMapper" Version="12.0.0" />
6356

64-
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
65-
<PropertyGroup>
66-
<AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
67-
</PropertyGroup>
68-
</Target>
57+
<!--microsoft
58+
asp.net core -->
59+
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect"
60+
Version="$(FrameworkVersion)" />
61+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
62+
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)" />
63+
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore"
64+
Version="$(FrameworkVersion)" />
65+
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson"
66+
Version="$(FrameworkVersion)" />
67+
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate"
68+
Version="$(FrameworkVersion)" />
69+
70+
<!--microsoft
71+
entity framework -->
72+
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational"
73+
Version="$(EntityFrameworkVersion)" />
74+
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite"
75+
Version="$(EntityFrameworkVersion)" />
76+
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory"
77+
Version="$(EntityFrameworkVersion)" />
78+
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer"
79+
Version="$(EntityFrameworkVersion)" />
80+
<PackageReference Update="Microsoft.EntityFrameworkCore.Design"
81+
Version="$(EntityFrameworkVersion)" PrivateAssets="All" />
82+
83+
</ItemGroup>
84+
85+
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
86+
<PropertyGroup>
87+
<AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
88+
</PropertyGroup>
89+
</Target>
6990
</Project>

‎src/EntityFramework.Storage/build/build.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -13,5 +13,5 @@
1313
<PackageReference Include="Bullseye" />
1414
<PackageReference Include="SimpleExec" />
1515
</ItemGroup>
16-
17-
</Project>
16+
17+
</Project>

‎src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -14,4 +14,4 @@
1414
<ProjectReference Include="..\..\src\IdentityServer4.EntityFramework.Storage.csproj" />
1515
</ItemGroup>
1616

17-
</Project>
17+
</Project>

‎src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" />
99
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
1010
<ProjectReference Include="..\..\src\IdentityServer4.EntityFramework.Storage.csproj" />
1111
</ItemGroup>
12-
12+
1313
</Project>

‎src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<PackageId>Cnblogs.IdentityServer4.EntityFramework.Storage</PackageId>
5-
<TargetFrameworks>net7.0</TargetFrameworks>
6-
5+
<TargetFrameworks>net9.0</TargetFrameworks>
6+
77
<Description>EntityFramework persistence layer for IdentityServer4</Description>
88
<Authors>Brock Allen;Dominick Baier;Scott Brady</Authors>
99
<PackageTags>OAuth2;OAuth 2.0;OpenID Connect;Security;Identity;IdentityServer;EntityFramework</PackageTags>
@@ -12,10 +12,11 @@
1212
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1313
<PackageReleaseNotes>https://github.com/cnblogs/IdentityServer4/releases</PackageReleaseNotes>
1414
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15-
15+
1616
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1717
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
18+
<AllowedOutputExtensionsInPackageBuildOutputFolder>
19+
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
1920

2021
<AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
2122
<SignAssembly>true</SignAssembly>
@@ -30,14 +31,14 @@
3031
<ItemGroup>
3132
<None Include="../../../icon.jpg" Pack="true" Visible="false" PackagePath="" />
3233
</ItemGroup>
33-
34+
3435
<ItemGroup>
3536
<PackageReference Include="Cnblogs.IdentityServer4.Storage" />
36-
37+
3738
<PackageReference Include="AutoMapper" />
3839

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

43-
</Project>
44+
</Project>

‎src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.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>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55

66
<AssemblyOriginatorKeyFile>../../../../key.snk</AssemblyOriginatorKeyFile>
77
<SignAssembly>true</SignAssembly>
@@ -11,20 +11,20 @@
1111
<ItemGroup>
1212
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1313
</ItemGroup>
14-
14+
1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\IdentityServer4.EntityFramework.Storage.csproj" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020
<PackageReference Include="Cnblogs.IdentityServer4" />
2121
<PackageReference Include="Cnblogs.IdentityServer4.Storage" />
22-
22+
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2424
<PackageReference Include="xunit" />
2525
<PackageReference Include="xunit.runner.visualstudio" />
2626
<PackageReference Include="FluentAssertions" />
27-
27+
2828
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
2929
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
3030
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />

0 commit comments

Comments
 (0)