Skip to content
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

Jump to bottom

Use Wilson 8.0 on .NET 8.0 and remove the System.* references that are brought transitively #2147

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Use Wilson 8.0 on .NET 8.0 and remove the System.* references that are brought transitively #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 24 additions & 34 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
Expand All @@ -48,8 +48,6 @@
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />

<!--
Note: the following references are exclusively used in the test projects:
Expand Down Expand Up @@ -95,9 +93,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
Expand All @@ -107,8 +105,6 @@
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />

<!--
Note: the following references are exclusively used in the test projects:
Expand Down Expand Up @@ -154,9 +150,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
Expand All @@ -166,8 +162,6 @@
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />

<!--
Note: the following references are exclusively used in the test projects:
Expand Down Expand Up @@ -243,9 +237,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="6.0.31" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="MongoDB.Bson" Version="2.20.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.20.0" />
Expand Down Expand Up @@ -289,9 +283,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="7.0.20" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="MongoDB.Bson" Version="2.20.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.20.0" />
Expand Down Expand Up @@ -336,9 +330,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.6" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.0.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.6" />
<PackageVersion Include="MongoDB.Bson" Version="2.20.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.20.0" />
Expand Down Expand Up @@ -403,9 +397,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
Expand All @@ -415,8 +409,6 @@
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />

<!--
Note: the following references are exclusively used in the source generators:
Expand Down Expand Up @@ -455,9 +447,9 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.32" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.3" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.1.14" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
Expand All @@ -466,8 +458,6 @@
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />

<!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
Expand Down
8 changes: 0 additions & 8 deletions src/OpenIddict.Abstractions/OpenIddict.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
Expand All @@ -40,13 +39,6 @@
<PackageReference Include="System.ComponentModel.Annotations" />
</ItemGroup>

<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="**\*.resx" GenerateSource="true" GenerateResourcesCodeAsConstants="true" />
</ItemGroup>
Expand Down