Skip to content

Commit 429f7da

Browse files
cnblogs-duducnblogs-dudu
committed
chore(deps): remove IdentityModel packages
1 parent 40a7f4a commit 429f7da

File tree

11 files changed

+34
-78
lines changed

11 files changed

+34
-78
lines changed

‎samples/Clients/Directory.Build.targets‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<AspNetVersion>3.1.0</AspNetVersion>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<AspNetVersion>3.1.0</AspNetVersion>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<PackageReference Update="IdentityModel" Version="4.3.0" />
9-
10-
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetVersion)" />
11-
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetVersion)" />
12-
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />
13-
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AspNetVersion)"/>
14-
15-
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
16-
</ItemGroup>
7+
<ItemGroup>
8+
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetVersion)" />
9+
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetVersion)" />
10+
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />
11+
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AspNetVersion)" />
12+
13+
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
14+
</ItemGroup>
1715
</Project>

‎samples/Clients/src/Constants/Constants.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@
44
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

7-
<ItemGroup>
8-
<PackageReference Include="IdentityModel" />
9-
</ItemGroup>
107
</Project>

‎samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="IdentityModel" />
10-
</ItemGroup>
11-
12-
</Project>
8+
</Project>

‎samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="IdentityModel" />
10-
</ItemGroup>
11-
12-
</Project>
8+
</Project>

‎samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="IdentityModel" />
10-
</ItemGroup>
11-
12-
</Project>
8+
</Project>

‎samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="IdentityModel" />
10-
</ItemGroup>
11-
12-
</Project>
8+
</Project>

‎samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="IdentityModel" />
10-
</ItemGroup>
11-
12-
</Project>
8+
</Project>

‎samples/Quickstarts/Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Update="IdentityModel" Version="4.3.0" />
98
<PackageReference Update="IdentityServer4" Version="4.0.0" />
109
<PackageReference Update="IdentityServer4.EntityFramework" Version="4.0.0" />
1110
<PackageReference Update="IdentityServer4.AspNetIdentity" Version="4.0.0" />

‎src/Directory.Build.targets‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,21 @@
2323

2424
<!--our
2525
stuff -->
26-
<PackageReference Update="IdentityModel" Version="6.0.0" />
2726

2827
<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)" />
28+
<PackageReference Update="Cnblogs.IdentityServer4.AspNetIdentity" Version="$(IdentityServerVersion)" />
29+
<PackageReference Update="Cnblogs.IdentityServer4.Storage" Version="$(IdentityServerVersion)" />
30+
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework.Storage" Version="$(IdentityServerVersion)" />
31+
<PackageReference Update="Cnblogs.IdentityServer4.EntityFramework" Version="$(IdentityServerVersion)" />
3732

3833
<!--microsoft
3934
extensions -->
40-
<PackageReference Update="Microsoft.Extensions.Caching.Memory"
41-
Version="$(ExtensionsVersion)" />
35+
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)" />
4236
<PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
4337
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
4438
<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)" />
39+
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(ExtensionsVersion)" />
40+
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(ExtensionsVersion)" />
4941

5042
<!--misc -->
5143
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
@@ -56,29 +48,20 @@
5648

5749
<!--microsoft
5850
asp.net core -->
59-
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect"
60-
Version="$(FrameworkVersion)" />
51+
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
6152
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
6253
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="2.3.1" />
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)" />
54+
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(FrameworkVersion)" />
55+
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(FrameworkVersion)" />
56+
<PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(FrameworkVersion)" />
6957

7058
<!--microsoft
7159
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" />
60+
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkVersion)" />
61+
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
62+
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkVersion)" />
63+
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkVersion)" />
64+
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All" />
8265

8366
</ItemGroup>
8467

‎src/IdentityServer4/src/IdentityServer4.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1919
<!-- Include PDB in the built .nupkg -->
2020
<AllowedOutputExtensionsInPackageBuildOutputFolder>
21-
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
21+
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
22+
</AllowedOutputExtensionsInPackageBuildOutputFolder>
2223

2324
<!-- strong naming fml -->
2425
<AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
@@ -42,7 +43,6 @@
4243

4344
<ItemGroup>
4445
<PackageReference Include="Cnblogs.IdentityServer4.Storage" />
45-
<PackageReference Include="IdentityModel" />
4646

4747
<PackageReference Include="Newtonsoft.Json" />
4848
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />

0 commit comments

Comments
 (0)