Browse Source

Remove the .NET Core 3.1 TFMs

pull/1873/head
Kévin Chalet 3 years ago
parent
commit
bfcae1b42e
  1. 1
      .github/workflows/build.yml
  2. 1
      Directory.Build.props
  3. 49
      Directory.Packages.props
  4. 37
      README.md
  5. 1
      global.json
  6. 1
      src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
  7. 1
      src/OpenIddict/OpenIddict.csproj

1
.github/workflows/build.yml

@ -43,7 +43,6 @@ jobs:
uses: actions/setup-dotnet@v3 uses: actions/setup-dotnet@v3
with: with:
dotnet-version: | dotnet-version: |
3.1.426
6.0.408 6.0.408
7.0.302 7.0.302

1
Directory.Build.props

@ -42,7 +42,6 @@
net48 net48
</NetFrameworkTargetFrameworks> </NetFrameworkTargetFrameworks>
<NetCoreTargetFrameworks Condition=" '$(NetCoreTargetFrameworks)' == '' "> <NetCoreTargetFrameworks Condition=" '$(NetCoreTargetFrameworks)' == '' ">
netcoreapp3.1;
net6.0; net6.0;
net7.0 net7.0
</NetCoreTargetFrameworks> </NetCoreTargetFrameworks>

49
Directory.Packages.props

@ -213,55 +213,6 @@
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" /> <GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup> </ItemGroup>
<!--
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
█████ ▀██ ██ ▄▄▄█▄▄ ▄▄████ ▄▄▀██ ▄▄▄ ██ ▄▄▀██ ▄▄▄███ ▄▄ ████▀ ███
█▀▀██ █ █ ██ ▄▄▄███ ██████ █████ ███ ██ ▀▀▄██ ▄▄▄█████▄▀█▀▀██ ███
█▄▄██ ██▄ ██ ▀▀▀███ ██████ ▀▀▄██ ▀▀▀ ██ ██ ██ ▀▀▀███ ▀▀ █▄▄█▀ ▀██
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
-->
<ItemGroup Label="Package versions for .NET Core 3.1"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '3.1')) ">
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.32" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.32" />
<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="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="6.25.1" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="6.25.1" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
<PackageVersion Include="MongoDB.Bson" Version="2.11.6" />
<PackageVersion Include="MongoDB.Driver" Version="2.11.6" />
<PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.7" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
<!--
Note: the following references are exclusively used in the test projects:
-->
<PackageVersion Include="AngleSharp" Version="0.14.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="4.1.1" />
<!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
some of the targeted TFMs (e.g Index, Range or nullable attributes on .NET Framework/.NET Standard).
-->
<GlobalPackageReference Include="PolySharp" Condition=" '$(DisablePolySharp)' != 'true' " Version="1.13.1" />
</ItemGroup>
<!-- <!--
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
█████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀▄▄▀████ ▄▄ ██ █████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀▄▄▀████ ▄▄ ██

37
README.md

@ -32,26 +32,27 @@ can be found in the [dedicated repository](https://github.com/openiddict/openidd
## Compatibility matrix ## Compatibility matrix
| Web framework version | .NET runtime version | OpenIddict 4.x | | Web framework version | .NET runtime version | OpenIddict 4.x | OpenIddict 5.x (preview) |
|-----------------------|----------------------|-----------------------------------------| |-----------------------|----------------------|-----------------------------------------|-----------------------------------------|
| ASP.NET Core 2.1 | .NET Framework 4.6.1 | :heavy_check_mark: :information_source: | | ASP.NET Core 2.1 | .NET Framework 4.6.1 | :heavy_check_mark: :information_source: | :heavy_check_mark: :information_source: |
| ASP.NET Core 2.1 | .NET Framework 4.7.2 | :heavy_check_mark: | | ASP.NET Core 2.1 | .NET Framework 4.7.2 | :heavy_check_mark: | :heavy_check_mark: |
| ASP.NET Core 2.1 | .NET Framework 4.8 | :heavy_check_mark: | | ASP.NET Core 2.1 | .NET Framework 4.8 | :heavy_check_mark: | :heavy_check_mark: |
| ASP.NET Core 2.1 | .NET Core 2.1 | :exclamation: | | ASP.NET Core 2.1 | .NET Core 2.1 | :exclamation: | :exclamation: |
| | | | | | | | |
| ASP.NET Core 3.1 | .NET Core 3.1 | :heavy_check_mark: | | ASP.NET Core 3.1 | .NET Core 3.1 | :heavy_check_mark: | :exclamation: |
| | | | | | | | |
| ASP.NET Core 5.0 | .NET 5.0 | :exclamation: | | ASP.NET Core 5.0 | .NET 5.0 | :exclamation: | :exclamation: |
| ASP.NET Core 6.0 | .NET 6.0 | :heavy_check_mark: | | ASP.NET Core 6.0 | .NET 6.0 | :heavy_check_mark: | :heavy_check_mark: |
| ASP.NET Core 7.0 | .NET 7.0 | :heavy_check_mark: | | ASP.NET Core 7.0 | .NET 7.0 | :heavy_check_mark: | :heavy_check_mark: |
| | | | | | | | |
| Microsoft.Owin 4.2 | .NET Framework 4.6.1 | :heavy_check_mark: :information_source: | | Microsoft.Owin 4.2 | .NET Framework 4.6.1 | :heavy_check_mark: :information_source: | :heavy_check_mark: :information_source: |
| Microsoft.Owin 4.2 | .NET Framework 4.7.2 | :heavy_check_mark: | | Microsoft.Owin 4.2 | .NET Framework 4.7.2 | :heavy_check_mark: | :heavy_check_mark: |
| Microsoft.Owin 4.2 | .NET Framework 4.8 | :heavy_check_mark: | | Microsoft.Owin 4.2 | .NET Framework 4.8 | :heavy_check_mark: | :heavy_check_mark: |
> **Warning** > **Warning**
> **ASP.NET Core 2.1 on .NET Core 2.1 and ASP.NET Core 5.0 on .NET 5.0 are no longer supported by Microsoft. While OpenIddict 4.x can still be > **ASP.NET Core 2.1 on .NET Core 2.1, ASP.NET Core 3.1 and 5.0 are no longer supported by Microsoft. While OpenIddict can still be used
> used on .NET Core 2.1 thanks to its .NET Standard 2.0 compatibility, users are strongly encouraged to migrate to ASP.NET Core/.NET 6.0**. > on these platforms thanks to its .NET Standard 2.0 compatibility, users are strongly encouraged to migrate to ASP.NET Core/.NET 6.0**.
>
> ASP.NET Core 2.1 on .NET Framework 4.6.1 (and higher) is still fully supported. > ASP.NET Core 2.1 on .NET Framework 4.6.1 (and higher) is still fully supported.
> **Note** > **Note**

1
global.json

@ -10,7 +10,6 @@
"runtimes": { "runtimes": {
"aspnetcore": [ "aspnetcore": [
"3.1.32",
"6.0.16", "6.0.16",
"7.0.5" "7.0.5"
] ]

1
src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj

@ -25,7 +25,6 @@
<None Include="_._" Pack="true" PackagePath="lib\net461\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net461\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net472\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net472\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net48\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net48\_._" />
<None Include="_._" Pack="true" PackagePath="lib\netcoreapp3.1\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net7.0\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net7.0\_._" />
</ItemGroup> </ItemGroup>

1
src/OpenIddict/OpenIddict.csproj

@ -36,7 +36,6 @@ To use these features on ASP.NET Core or OWIN/Katana/ASP.NET 4.x, reference the
<None Include="_._" Pack="true" PackagePath="lib\net461\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net461\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net472\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net472\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net48\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net48\_._" />
<None Include="_._" Pack="true" PackagePath="lib\netcoreapp3.1\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net6.0-windows7.0\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net6.0-windows7.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net6.0-windows10.0.17763\_._" /> <None Include="_._" Pack="true" PackagePath="lib\net6.0-windows10.0.17763\_._" />

Loading…
Cancel
Save