Merge pull request #26261 from dotnet-maestro-bot/merge/release/5.0-rc2-to-master

[automated] Merge branch 'release/5.0-rc2' => 'master'

Author: dougbu

eng/targets/Helix.Common.props

@@ -33,7 +33,6 @@
     <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="Linux" />
-    <HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />

src/Components/WebAssembly/Authentication.Msal/src/Interop/AuthenticationService.ts

@@ -54,6 +54,7 @@ class MsalAuthorizeService implements AuthorizeService {
     private readonly _msalApplication: Msal.PublicClientApplication;
     private _account: Msal.AccountInfo | undefined;
     private _redirectCallback: Promise<AuthenticationResult | null> | undefined;
+    private _requestedScopes: string[] | undefined;
 
     constructor(private readonly _settings: AuthorizeServiceConfiguration) {
         if (this._settings.auth?.knownAuthorities?.length == 0) {
@@ -81,10 +82,23 @@ class MsalAuthorizeService implements AuthorizeService {
             return;
         }
 
+        const scopes: string[] = [];
+        if (this._settings.defaultAccessTokenScopes && this._settings.defaultAccessTokenScopes.length > 0) {
+            scopes.push(...this._settings.defaultAccessTokenScopes)
+        }
+
+        if (this._settings.additionalScopesToConsent && this._settings.additionalScopesToConsent.length > 0) {
+            scopes.push(...this._settings.additionalScopesToConsent);
+        }
+
+        if (this._requestedScopes && this._requestedScopes.length > 0) {
+            scopes.push(...this._requestedScopes);
+        }
+
         const silentRequest = {
             redirectUri: this._settings.auth?.redirectUri,
             account: account,
-            scopes: this._settings.defaultAccessTokenScopes
+            scopes: scopes
         };
 
         const response = await this._msalApplication.acquireTokenSilent(silentRequest);
@@ -111,6 +125,7 @@ class MsalAuthorizeService implements AuthorizeService {
             return;
         }
 
+        this._requestedScopes = scopes;
         const silentRequest = {
             redirectUri: this._settings.auth?.redirectUri,
             account: account,
@@ -162,7 +177,7 @@ class MsalAuthorizeService implements AuthorizeService {
                     const silentRequest = {
                         redirectUri: request.redirectUri,
                         account: account,
-                        scopes: request.scopes,
+                        scopes: request.scopes.concat(request.extraScopesToConsent || [])
                     };
                     await this._msalApplication.acquireTokenSilent(silentRequest);
                 }

src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs

@@ -6,6 +6,7 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
@@ -46,7 +47,7 @@ public static bool VerifyMaxLength(DbContext context, string table, int maxLengt
 
             foreach (var property in context.Model.GetEntityTypes().Single(e => e.GetTableName() == table).GetProperties())
             {
-                if (!columns.Contains(property.GetColumnName()))
+                if (!columns.Contains(property.GetColumnName(StoreObjectIdentifier.Table(table, property.DeclaringEntityType.GetSchema()))))
                 {
                     continue;
                 }

src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/appsettings.json

@@ -1,7 +1,7 @@
 {
   ////#if (IndividualLocalAuth)
   //"Local": {
-  //  "Authority": "https://login.microsoftonline.com/",
+  //  "Authority": "https:////login.microsoftonline.com/",
   //  "ClientId": "33333333-3333-3333-33333333333333333"
   //}
   ////#endif