Update to ASP.NET 5 RC1

Update to RC1 of ASP.NET 5.

Author: martincostello

Directory.Packages.props

@@ -4,10 +4,10 @@
     <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="5.0.0-preview.8.*" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.0-preview.8.*" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0-preview.8.*" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-preview.8.*" />
+    <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="6.6.0" />
     <PackageVersion Include="Moq" Version="4.14.5" />

eng/Versions.props

@@ -5,9 +5,9 @@
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>8</PreReleaseVersionIteration>
-    <PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
+    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseBrandingLabel>RC $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>

global.json

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

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.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,8 +170,8 @@ 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))

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

@@ -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.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.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/AutomaticAuthenticationHandler.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);
         }
 
         protected override string BuildChallengeUrl([NotNull] AuthenticationProperties properties, [NotNull] string redirectUri)

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/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/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/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/BitbucketAuthenticationHandler.cs

@@ -72,7 +72,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             }
 
             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)

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/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/DeezerAuthenticationHandler.cs

@@ -104,7 +104,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);
         }
 
         protected override string BuildChallengeUrl([NotNull] AuthenticationProperties properties, [NotNull] string redirectUri)

src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationHandler.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.Discord/DiscordAuthenticationHandler.cs

@@ -74,7 +74,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.Dropbox/DropboxAuthenticationHandler.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.EVEOnline/EVEOnlineAuthenticationHandler.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.ExactOnline/ExactOnlineAuthenticationHandler.cs

@@ -64,7 +64,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions(user);
 
             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.Fitbit/FitbitAuthenticationHandler.cs

@@ -60,7 +60,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             context.RunClaimActions(payload.RootElement.GetProperty("user"));
 
             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 async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OAuthCodeExchangeContext context)

src/AspNet.Security.OAuth.Foursquare/FoursquareAuthenticationHandler.cs

@@ -73,7 +73,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             }
 
             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.GitHub/GitHubAuthenticationHandler.cs

@@ -72,7 +72,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             }
 
             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)

src/AspNet.Security.OAuth.GitLab/GitLabAuthenticationHandler.cs

@@ -58,7 +58,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.Gitee/GiteeAuthenticationHandler.cs

@@ -72,7 +72,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             }
 
             await Options.Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+            return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
 
         protected async Task<string?> GetEmailAsync([NotNull] OAuthTokenResponse tokens)

src/AspNet.Security.OAuth.Gitter/GitterAuthenticationHandler.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.Harvest/HarvestAuthenticationHandler.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.HealthGraph/HealthGraphAuthenticationHandler.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.Imgur/ImgurAuthenticationHandler.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.Instagram/InstagramAuthenticationHandler.cs

@@ -65,7 +65,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.LinkedIn/LinkedInAuthenticationHandler.cs

@@ -81,7 +81,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             }
 
             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)

src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationOptions.cs

@@ -140,7 +140,7 @@ private static IEnumerable<string> GetPictureUrls(JsonElement user)
                     continue;
                 }
 
-                string pictureUrl = imageIdentifier
+                string? pictureUrl = imageIdentifier
                     .EnumerateArray()
                     .FirstOrDefault()
                     .GetString("identifier");

src/AspNet.Security.OAuth.MailChimp/MailChimpAuthenticationHandler.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.MailRu/MailRuAuthenticationHandler.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.Myob/MyobAuthenticationHandler.cs

@@ -40,7 +40,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.NetEase/NetEaseAuthenticationHandler.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.Nextcloud/NextcloudAuthenticationHandler.cs

@@ -35,7 +35,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             [NotNull] AuthenticationProperties properties,
             [NotNull] OAuthTokenResponse tokens)
         {
-            string userId = tokens.Response.RootElement.GetString("user_id");
+            string userId = tokens.Response.RootElement.GetString("user_id") ?? string.Empty;
             string userEndpoint = Options.UserInformationEndpoint.TrimEnd('/');
             userEndpoint += $"/{Uri.EscapeUriString(userId)}";
 
@@ -62,7 +62,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);
         }
     }
 }