Support ASP.NET 5 using RC1

Directory.Packages.props

@@ -4,16 +4,16 @@
     <PackageVersion Include="JetBrains.Annotations" Version="2020.1.0" />
     <PackageVersion Include="JustEat.HttpClientInterception" Version="3.0.0" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.1.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.0-rc.1.*" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.0-rc.1.*" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0-rc.1.*" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-rc.1.*" />
     <PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.5.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.6.0" />
     <PackageVersion Include="Moq" Version="4.14.5" />
     <PackageVersion Include="Shouldly" Version="3.0.2" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="5.5.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.6.0" />
   </ItemGroup>
 
 </Project>

eng/Versions.props

@@ -1,13 +1,17 @@
 <Project>
 
   <PropertyGroup>
-    <MajorVersion>3</MajorVersion>
-    <MinorVersion>1</MinorVersion>
-    <PatchVersion>4</PatchVersion>
+    <MajorVersion>5</MajorVersion>
+    <MinorVersion>0</MinorVersion>
+    <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseBrandingLabel>RC $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
+    <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
+    <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
   </PropertyGroup>
 
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.401"
+    "dotnet": "5.0.100-rc.1.20452.10"
   },
 
   "msbuild-sdks": {

samples/Mvc.Client/Controllers/AuthenticationController.cs

@@ -40,7 +40,7 @@ public async Task<IActionResult> SignIn([FromForm] string provider)
 
         [HttpGet("~/signout")]
         [HttpPost("~/signout")]
-        public IActionResult SignOut()
+        public override SignOutResult SignOut()
         {
             // Instruct the cookies middleware to delete the local cookie created
             // when the user agent is redirected from the external identity provider

samples/Mvc.Client/Mvc.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <UserSecretsId>AspNet.Security.OAuth.Providers.Mvc.Client</UserSecretsId>
   </PropertyGroup>
 

src/AspNet.Security.OAuth.Amazon/AmazonAuthenticationHandler.cs

@@ -76,7 +76,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Amazon/AspNet.Security.OAuth.Amazon.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Apple/AppleAuthenticationEvents.cs

@@ -22,7 +22,7 @@ public class AppleAuthenticationEvents : OAuthEvents
         /// </summary>
         public Func<AppleGenerateClientSecretContext, Task> OnGenerateClientSecret { get; set; } = async context =>
         {
-            var provider = context.HttpContext.RequestServices.GetService<AppleClientSecretGenerator>();
+            var provider = context.HttpContext!.RequestServices!.GetRequiredService<AppleClientSecretGenerator>();
             context.Options.ClientSecret = await provider.GenerateAsync(context);
         };
 

src/AspNet.Security.OAuth.Apple/AppleAuthenticationHandler.cs

@@ -80,7 +80,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             [NotNull] AuthenticationProperties properties,
             [NotNull] OAuthTokenResponse tokens)
         {
-            string idToken = tokens.Response.RootElement.GetString("id_token");
+            string? idToken = tokens.Response.RootElement.GetString("id_token");
 
             Logger.LogInformation("Creating ticket for Sign in with Apple.");
 
@@ -118,7 +118,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
 
         /// <inheritdoc />
@@ -170,13 +170,13 @@ protected virtual IEnumerable<Claim> ExtractClaimsFromUser([NotNull] JsonElement
 
             if (user.TryGetProperty("name", out var name))
             {
-                claims.Add(new Claim(ClaimTypes.GivenName, name.GetString("firstName"), ClaimValueTypes.String, ClaimsIssuer));
-                claims.Add(new Claim(ClaimTypes.Surname, name.GetString("lastName"), ClaimValueTypes.String, ClaimsIssuer));
+                claims.Add(new Claim(ClaimTypes.GivenName, name.GetString("firstName") ?? string.Empty, ClaimValueTypes.String, ClaimsIssuer));
+                claims.Add(new Claim(ClaimTypes.Surname, name.GetString("lastName") ?? string.Empty, ClaimValueTypes.String, ClaimsIssuer));
             }
 
             if (user.TryGetProperty("email", out var email))
             {
-                claims.Add(new Claim(ClaimTypes.Email, email.GetString(), ClaimValueTypes.String, ClaimsIssuer));
+                claims.Add(new Claim(ClaimTypes.Email, email.GetString() ?? string.Empty, ClaimValueTypes.String, ClaimsIssuer));
             }
 
             return claims;

src/AspNet.Security.OAuth.Apple/AspNet.Security.OAuth.Apple.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.ArcGIS/ArcGISAuthenticationHandler.cs

@@ -38,7 +38,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             [NotNull] OAuthTokenResponse tokens)
         {
             // Note: the ArcGIS API doesn't support content negotiation via headers.
-            string address = QueryHelpers.AddQueryString(Options.UserInformationEndpoint, new Dictionary<string, string>
+            string address = QueryHelpers.AddQueryString(Options.UserInformationEndpoint, new Dictionary<string, string?>
             {
                 ["f"] = "json",
                 ["token"] = tokens.AccessToken
@@ -68,7 +68,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.ArcGIS/AspNet.Security.OAuth.ArcGIS.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Asana/AsanaAuthenticationHandler.cs

@@ -57,7 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions(payload.RootElement.GetProperty("data"));
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Asana/AspNet.Security.OAuth.Asana.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Autodesk/AspNet.Security.OAuth.Autodesk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Autodesk/AutodeskAuthenticationHandler.cs

@@ -57,7 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Automatic/AspNet.Security.OAuth.Automatic.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Automatic/AutomaticAuthenticationHandler.cs

@@ -59,13 +59,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
 
         protected override string BuildChallengeUrl([NotNull] AuthenticationProperties properties, [NotNull] string redirectUri)
         {
             // Note: the redirect_uri parameter is not allowed by Automatic and MUST NOT be sent.
-            return QueryHelpers.AddQueryString(Options.AuthorizationEndpoint, new Dictionary<string, string>
+            return QueryHelpers.AddQueryString(Options.AuthorizationEndpoint, new Dictionary<string, string?>
             {
                 ["client_id"] = Options.ClientId,
                 ["response_type"] = "code",

src/AspNet.Security.OAuth.Baidu/AspNet.Security.OAuth.Baidu.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Baidu/BaiduAuthenticationHandler.cs

@@ -59,7 +59,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Baidu/BaiduAuthenticationOptions.cs

@@ -31,7 +31,7 @@ public BaiduAuthenticationOptions()
             ClaimActions.MapCustomJson(BaiduAuthenticationConstants.Claims.Portrait,
                 user =>
                 {
-                    string portrait = user.GetString("portrait");
+                    string? portrait = user.GetString("portrait");
                     return string.IsNullOrWhiteSpace(portrait) ?
                         null :
                         $"https://tb.himg.baidu.com/sys/portrait/item/{WebUtility.UrlEncode(portrait)}";

src/AspNet.Security.OAuth.Basecamp/AspNet.Security.OAuth.Basecamp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Basecamp/BasecampAuthenticationHandler.cs

@@ -57,7 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.BattleNet/AspNet.Security.OAuth.BattleNet.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.BattleNet/BattleNetAuthenticationHandler.cs

@@ -59,7 +59,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Beam/AspNet.Security.OAuth.Beam.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Beam/BeamAuthenticationHandler.cs

@@ -57,7 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Bitbucket/AspNet.Security.OAuth.Bitbucket.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Bitbucket/BitbucketAuthenticationHandler.cs

@@ -63,19 +63,19 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
                 !identity.HasClaim(claim => claim.Type == ClaimTypes.Email) &&
                 Options.Scope.Contains("email"))
             {
-                string address = await GetEmailAsync(tokens);
+                string? address = await GetEmailAsync(tokens);
 
                 if (!string.IsNullOrEmpty(address))
                 {
-                    identity.AddClaim(new Claim(ClaimTypes.Email, address, ClaimValueTypes.String, Options.ClaimsIssuer));
+                    identity.AddClaim(new Claim(ClaimTypes.Email, address!, ClaimValueTypes.String, Options.ClaimsIssuer));
                 }
             }
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
 
-        protected virtual async Task<string> GetEmailAsync([NotNull] OAuthTokenResponse tokens)
+        protected virtual async Task<string?> GetEmailAsync([NotNull] OAuthTokenResponse tokens)
         {
             using var request = new HttpRequestMessage(HttpMethod.Get, Options.UserEmailsEndpoint);
             request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));

src/AspNet.Security.OAuth.Buffer/AspNet.Security.OAuth.Buffer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.Buffer/BufferAuthenticationHandler.cs

@@ -57,7 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.CiscoSpark/AspNet.Security.OAuth.CiscoSpark.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/AspNet.Security.OAuth.CiscoSpark/CiscoSparkAuthenticationHandler.cs

@@ -57,7 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions();
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
     }
 }

src/AspNet.Security.OAuth.Deezer/AspNet.Security.OAuth.Deezer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>