Bump the .NET SDK to 8.0.100 and add a .NET 8.0 TFM

2 years ago · f0650028fb
17 changed files with 120 additions and 20 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -46,6 +46,7 @@ jobs:
          3.1.426
          6.0.408
          7.0.302
+          8.0.100

    # Arcade only allows the revision to contain up to two characters, and GitHub Actions does not roll-over
    # build numbers every day like Azure DevOps does. To balance these two requirements, set the official
@ -105,7 +106,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: '7.0.302'
+        dotnet-version: '8.0.100'

    - name: Validate NuGet packages
      shell: pwsh
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -44,13 +44,16 @@
    <NetCoreTargetFrameworks Condition=" '$(NetCoreTargetFrameworks)' == '' ">
      netcoreapp3.1;
      net6.0;
-      net7.0
+      net7.0;
+      net8.0
    </NetCoreTargetFrameworks>
    <NetCoreWindowsTargetFrameworks Condition=" '$(NetCoreWindowsTargetFrameworks)' == '' ">
      net6.0-windows7.0;
      net6.0-windows10.0.17763;
      net7.0-windows7.0;
-      net7.0-windows10.0.17763
+      net7.0-windows10.0.17763;
+      net8.0-windows7.0;
+      net8.0-windows10.0.17763
    </NetCoreWindowsTargetFrameworks>
    <NetStandardTargetFrameworks Condition=" '$(NetStandardTargetFrameworks)' == '' ">
      netstandard2.0;
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -109,6 +109,11 @@
    <DefineConstants>$(DefineConstants);SUPPORTS_AUTHENTICATION_HANDLER_SELECTION_FALLBACK</DefineConstants>
  </PropertyGroup>

+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0'))) ">
+    <DefineConstants>$(DefineConstants);SUPPORTS_TIME_PROVIDER</DefineConstants>
+  </PropertyGroup>
+
  <PropertyGroup
    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -188,8 +188,8 @@
    <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices"                 Version="1.0.14"          />
    <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms"                    Version="1.0.14"          />
    <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf"                         Version="1.0.14"          />
-    <PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework"                       Version="2.2.3"           />
-    <PackageVersion Include="Microsoft.AspNet.Identity.Owin"                                  Version="2.2.3"           />
+    <PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework"                       Version="2.2.4"           />
+    <PackageVersion Include="Microsoft.AspNet.Identity.Owin"                                  Version="2.2.4"           />
    <PackageVersion Include="Microsoft.AspNet.Mvc"                                            Version="5.2.9"           />
    <PackageVersion Include="Microsoft.AspNet.Web.Optimization"                               Version="1.1.3"           />
    <PackageVersion Include="Microsoft.AspNet.WebApi.Owin"                                    Version="5.2.9"           />
@ -345,17 +345,61 @@
    <PackageVersion Include="Moq"                                                             Version="4.18.4"          />
    <PackageVersion Include="System.Linq.Async"                                               Version="6.0.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>
+
+  <!--
+                                          ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+                                          █████ ▀██ ██ ▄▄▄█▄▄ ▄▄███▀▄▄▀████ ▄▄ ██
+                                          █▀▀██ █ █ ██ ▄▄▄███ █████▀▄▄▀█▀▀█ ▀▄ ██
+                                          █▄▄██ ██▄ ██ ▀▀▀███ █████▄▀▀▄█▄▄█ ▀▀ ██
+                                          ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+  -->
+
+  <ItemGroup Label="Package versions for .NET 8.0"
+    Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
+    <PackageVersion Include="EntityFramework"                                                 Version="6.4.4"           />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational"                        Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions"                       Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory"                             Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions"           Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions"                       Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly"                                 Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Logging"                                    Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Options"                                    Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Primitives"                                 Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.WebEncoders"                                Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens"                           Version="7.0.0"           />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols"                               Version="7.0.0"           />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens"                                  Version="7.0.0"           />
+    <PackageVersion Include="MongoDB.Bson"                                                    Version="2.20.0"          />
+    <PackageVersion Include="MongoDB.Driver"                                                  Version="2.20.0"          />
+    <PackageVersion Include="Quartz.Extensions.DependencyInjection"                           Version="3.5.0"           />
+
+    <!--
+      Note: the following references are exclusively used in the test projects:
+    -->
+    <PackageVersion Include="AngleSharp"                                                      Version="0.17.1"          />
+    <PackageVersion Include="MartinCostello.Logging.XUnit"                                    Version="0.3.0"           />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost"                                   Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection"                        Version="8.0.0"           />
+    <PackageVersion Include="Moq"                                                             Version="4.18.4"          />
+    <PackageVersion Include="System.Linq.Async"                                               Version="6.0.1"           />
+
    <!--
      Note: the following references are exclusively used in the samples:
    -->
    <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices"                 Version="1.0.14"          />
    <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms"                    Version="1.0.14"          />
    <PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf"                         Version="1.0.14"          />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore"               Version="7.0.5"           />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite"                            Version="7.0.5"           />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer"                         Version="7.0.5"           />
-    <PackageVersion Include="Microsoft.Extensions.Hosting"                                    Version="7.0.1"           />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug"                              Version="7.0.0"           />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore"               Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite"                            Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Hosting"                                    Version="8.0.0"           />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug"                              Version="8.0.0"           />
    <PackageVersion Include="Quartz.Extensions.Hosting"                                       Version="3.5.0"           />
    <PackageVersion Include="Spectre.Console"                                                 Version="0.46.0"          />

--- a/global.json
+++ b/global.json
@ -1,18 +1,19 @@
 {
  "sdk": {
-    "version": "7.0.302",
+    "version": "8.0.100",
    "allowPrerelease": true,
    "rollForward": "major"
  },

  "tools": {
-    "dotnet": "7.0.302",
+    "dotnet": "8.0.100",

    "runtimes": {
      "aspnetcore": [
        "3.1.32",
        "6.0.16",
-        "7.0.5"
+        "7.0.5",
+        "8.0.0"
      ]
    }
  },
--- a/sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj
+++ b/sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <IsShipping>false</IsShipping>
    <Nullable>disable</Nullable>
  </PropertyGroup>
--- a/sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
+++ b/sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <IsShipping>false</IsShipping>
    <SignAssembly>false</SignAssembly>
    <TypeScriptEnabled>false</TypeScriptEnabled>
--- a/sandbox/OpenIddict.Sandbox.Console.Client/OpenIddict.Sandbox.Console.Client.csproj
+++ b/sandbox/OpenIddict.Sandbox.Console.Client/OpenIddict.Sandbox.Console.Client.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
    <EnablePreviewFeatures>true</EnablePreviewFeatures>
    <IsShipping>false</IsShipping>
    <SignAssembly>false</SignAssembly>
--- a/sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj
+++ b/sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;net7.0-windows7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0-windows7.0</TargetFrameworks>
    <EnablePreviewFeatures>true</EnablePreviewFeatures>
    <EnableWindowsTargeting>true</EnableWindowsTargeting>
    <UseWindowsForms>true</UseWindowsForms>
--- a/sandbox/OpenIddict.Sandbox.Wpf.Client/OpenIddict.Sandbox.Wpf.Client.csproj
+++ b/sandbox/OpenIddict.Sandbox.Wpf.Client/OpenIddict.Sandbox.Wpf.Client.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;net7.0-windows10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0-windows10.0.17763</TargetFrameworks>
    <EnablePreviewFeatures>true</EnablePreviewFeatures>
    <EnableWindowsTargeting>true</EnableWindowsTargeting>
    <UseWPF>true</UseWPF>
--- a/src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
+++ b/src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
@ -28,6 +28,7 @@
    <None Include="_._" Pack="true" PackagePath="lib\netcoreapp3.1\_._" />
    <None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" />
    <None Include="_._" Pack="true" PackagePath="lib\net7.0\_._" />
+    <None Include="_._" Pack="true" PackagePath="lib\net8.0\_._" />
  </ItemGroup>

 </Project>
--- a/src/OpenIddict.Client.AspNetCore/OpenIddictClientAspNetCoreHandler.cs
+++ b/src/OpenIddict.Client.AspNetCore/OpenIddictClientAspNetCoreHandler.cs
@ -30,6 +30,19 @@ public sealed class OpenIddictClientAspNetCoreHandler : AuthenticationHandler<Op
    /// <summary>
    /// Creates a new instance of the <see cref="OpenIddictClientAspNetCoreHandler"/> class.
    /// </summary>
+#if SUPPORTS_TIME_PROVIDER
+    public OpenIddictClientAspNetCoreHandler(
+        IOpenIddictClientDispatcher dispatcher,
+        IOpenIddictClientFactory factory,
+        IOptionsMonitor<OpenIddictClientAspNetCoreOptions> options,
+        ILoggerFactory logger,
+        UrlEncoder encoder)
+        : base(options, logger, encoder)
+    {
+        _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
+        _factory = factory ?? throw new ArgumentNullException(nameof(factory));
+    }
+#else
    public OpenIddictClientAspNetCoreHandler(
        IOpenIddictClientDispatcher dispatcher,
        IOpenIddictClientFactory factory,
@ -42,6 +55,7 @@ public sealed class OpenIddictClientAspNetCoreHandler : AuthenticationHandler<Op
        _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
        _factory = factory ?? throw new ArgumentNullException(nameof(factory));
    }
+#endif

    /// <inheritdoc/>
    public async Task<bool> HandleRequestAsync()
--- a/src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj
+++ b/src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj
@ -17,7 +17,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" NoWarn="NU1902" />
+    <PackageReference Include="MongoDB.Bson" />
  </ItemGroup>

  <ItemGroup
--- a/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
+++ b/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
@ -21,7 +21,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" NoWarn="NU1902" />
+    <PackageReference Include="MongoDB.Driver" NoWarn="NU1901;NU1902;NU1903;NU1904" />
  </ItemGroup>

  <ItemGroup>
--- a/src/OpenIddict.Server.AspNetCore/OpenIddictServerAspNetCoreHandler.cs
+++ b/src/OpenIddict.Server.AspNetCore/OpenIddictServerAspNetCoreHandler.cs
@ -30,6 +30,19 @@ public sealed class OpenIddictServerAspNetCoreHandler : AuthenticationHandler<Op
    /// <summary>
    /// Creates a new instance of the <see cref="OpenIddictServerAspNetCoreHandler"/> class.
    /// </summary>
+#if SUPPORTS_TIME_PROVIDER
+    public OpenIddictServerAspNetCoreHandler(
+        IOpenIddictServerDispatcher dispatcher,
+        IOpenIddictServerFactory factory,
+        IOptionsMonitor<OpenIddictServerAspNetCoreOptions> options,
+        ILoggerFactory logger,
+        UrlEncoder encoder)
+        : base(options, logger, encoder)
+    {
+        _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
+        _factory = factory ?? throw new ArgumentNullException(nameof(factory));
+    }
+#else
    public OpenIddictServerAspNetCoreHandler(
        IOpenIddictServerDispatcher dispatcher,
        IOpenIddictServerFactory factory,
@ -42,6 +55,7 @@ public sealed class OpenIddictServerAspNetCoreHandler : AuthenticationHandler<Op
        _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
        _factory = factory ?? throw new ArgumentNullException(nameof(factory));
    }
+#endif

    /// <inheritdoc/>
    public async Task<bool> HandleRequestAsync()
--- a/src/OpenIddict.Validation.AspNetCore/OpenIddictValidationAspNetCoreHandler.cs
+++ b/src/OpenIddict.Validation.AspNetCore/OpenIddictValidationAspNetCoreHandler.cs
@ -26,6 +26,19 @@ public sealed class OpenIddictValidationAspNetCoreHandler : AuthenticationHandle
    /// <summary>
    /// Creates a new instance of the <see cref="OpenIddictValidationAspNetCoreHandler"/> class.
    /// </summary>
+#if SUPPORTS_TIME_PROVIDER
+    public OpenIddictValidationAspNetCoreHandler(
+        IOpenIddictValidationDispatcher dispatcher,
+        IOpenIddictValidationFactory factory,
+        IOptionsMonitor<OpenIddictValidationAspNetCoreOptions> options,
+        ILoggerFactory logger,
+        UrlEncoder encoder)
+        : base(options, logger, encoder)
+    {
+        _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
+        _factory = factory ?? throw new ArgumentNullException(nameof(factory));
+    }
+#else
    public OpenIddictValidationAspNetCoreHandler(
        IOpenIddictValidationDispatcher dispatcher,
        IOpenIddictValidationFactory factory,
@ -38,6 +51,7 @@ public sealed class OpenIddictValidationAspNetCoreHandler : AuthenticationHandle
        _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
        _factory = factory ?? throw new ArgumentNullException(nameof(factory));
    }
+#endif

    /// <inheritdoc/>
    public async Task<bool> HandleRequestAsync()
--- a/src/OpenIddict/OpenIddict.csproj
+++ b/src/OpenIddict/OpenIddict.csproj
@ -43,6 +43,9 @@ To use these features on ASP.NET Core or OWIN/Katana/ASP.NET 4.x, reference the
    <None Include="_._" Pack="true" PackagePath="lib\net7.0\_._" />
    <None Include="_._" Pack="true" PackagePath="lib\net7.0-windows7.0\_._" />
    <None Include="_._" Pack="true" PackagePath="lib\net7.0-windows10.0.17763\_._" />
+    <None Include="_._" Pack="true" PackagePath="lib\net8.0\_._" />
+    <None Include="_._" Pack="true" PackagePath="lib\net8.0-windows7.0\_._" />
+    <None Include="_._" Pack="true" PackagePath="lib\net8.0-windows10.0.17763\_._" />
    <None Include="_._" Pack="true" PackagePath="lib\netstandard2.0\_._" />
    <None Include="_._" Pack="true" PackagePath="lib\netstandard2.1\_._" />
  </ItemGroup>