Skip to content

Commit 30ded54

Browse files
author
msftbot[bot]
authored
Merge pull request #23939 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'
2 parents 303a9bf + 028cb6b commit 30ded54

File tree

7 files changed

+629
-588
lines changed

7 files changed

+629
-588
lines changed

‎eng/Baseline.Designer.props

Lines changed: 232 additions & 232 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.5">
7+
<Baseline Version="3.1.6">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.5" />
11-
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.5" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.5" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.5" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.5" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.5" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.5" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.5" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.5" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.5" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.5" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.5" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.5" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.5" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.5" />
29-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.5" />
30-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.5" />
31-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
32-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.5" />
33-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
34-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
35-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
36-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
37-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
38-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
39-
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.5" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.5" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.5" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.5" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.5" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.5" />
46-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.5" />
47-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.5" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.5" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.5" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.5" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.5" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.5" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.5" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.5" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.5" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.5" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.5" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.5" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.5" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.5" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.5" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.5" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.5" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.5" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.5" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.5" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.5" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.5" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.5" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.5" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.5" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.5" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.5" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.5" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.5" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.5" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.5" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.5" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.5" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.5" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.5" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.5" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.5" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.5" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.5" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.5" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.6" />
11+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
12+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.6" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.6" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.6" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.6" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.6" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.6" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.6" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.6" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.6" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.6" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.6" />
25+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.6" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.6" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.6" />
28+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.6" />
29+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.6" />
30+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.6" />
31+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.6" />
32+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.6" />
33+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.6" />
34+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
35+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
36+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
37+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
38+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
39+
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
40+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.6" />
41+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.6" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.6" />
43+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.6" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.6" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.6" />
46+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.6" />
47+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.6" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.6" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.6" />
50+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
51+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.6" />
52+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.6" />
53+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.6" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.6" />
55+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.6" />
56+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.6" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.6" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.6" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.6" />
60+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.6" />
61+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.6" />
62+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.6" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.6" />
65+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.6" />
66+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.6" />
67+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.6" />
68+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.6" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.6" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.6" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.6" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.6" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.6" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.6" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.6" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.6" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.6" />
78+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.6" />
79+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
80+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.6" />
81+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.6" />
82+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.6" />
83+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.6" />
84+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.6" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.6" />
86+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.6" />
87+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.6" />
88+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.6" />
89+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.6" />
9090
</Baseline>

‎eng/tools/BaselineGenerator/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private async Task<int> RunUpdateAsync(
177177
var versionAttribute = document.Root.Attribute("Version");
178178
hasChanged = await TryUpdateVersionAsync(
179179
versionAttribute,
180-
"Microsoft.AspNetCore.App",
180+
"Microsoft.AspNetCore.App.Runtime.win-x64",
181181
packageMetadataResource,
182182
logger,
183183
cacheContext);

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ public AzureADOpenIdConnectOptionsConfiguration(IOptions<AzureADSchemeOptions> s
2121
public void Configure(string name, OpenIdConnectOptions options)
2222
{
2323
var azureADScheme = GetAzureADScheme(name);
24+
if (azureADScheme is null)
25+
{
26+
return;
27+
}
28+
2429
var azureADOptions = _azureADOptions.Get(azureADScheme);
2530
if (name != azureADOptions.OpenIdConnectSchemeName)
2631
{

‎src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,5 +485,25 @@ public void AddAzureADBearer_SkipsOptionsValidationForNonAzureCookies()
485485

486486
Assert.NotNull(jwtOptions.Get("other"));
487487
}
488+
489+
[Fact]
490+
public void AddAzureAD_SkipsOptionsValidationForNonAzureOpenIdConnect()
491+
{
492+
var services = new ServiceCollection();
493+
services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());
494+
495+
services.AddAuthentication()
496+
.AddAzureAD(o => { })
497+
.AddOpenIdConnect("other", null, o =>
498+
{
499+
o.ClientId = "ClientId";
500+
o.Authority = "https://authority.com";
501+
});
502+
503+
var provider = services.BuildServiceProvider();
504+
var openIdConnectOptions = provider.GetService<IOptionsMonitor<OpenIdConnectOptions>>();
505+
506+
Assert.NotNull(openIdConnectOptions.Get("other"));
507+
}
488508
}
489509
}

‎src/Framework/test/TargetingPackTests.cs

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,23 @@ public TargetingPackTests(ITestOutputHelper output)
3737
[Fact]
3838
public void TargetingPackContainsListedAssemblies()
3939
{
40+
if (!_isTargetingPackBuilding)
41+
{
42+
return;
43+
}
44+
4045
var actualAssemblies = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll")
4146
.Select(Path.GetFileNameWithoutExtension)
4247
.ToHashSet();
48+
var listedTargetingPackAssemblies = TestData.ListedTargetingPackAssemblies.Keys.ToHashSet();
4349

4450
_output.WriteLine("==== actual assemblies ====");
4551
_output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
4652
_output.WriteLine("==== expected assemblies ====");
47-
_output.WriteLine(string.Join('\n', TestData.ListedTargetingPackAssemblies.OrderBy(i => i)));
53+
_output.WriteLine(string.Join('\n', listedTargetingPackAssemblies.OrderBy(i => i)));
4854

49-
var missing = TestData.ListedTargetingPackAssemblies.Except(actualAssemblies);
50-
var unexpected = actualAssemblies.Except(TestData.ListedTargetingPackAssemblies);
55+
var missing = listedTargetingPackAssemblies.Except(actualAssemblies);
56+
var unexpected = actualAssemblies.Except(listedTargetingPackAssemblies);
5157

5258
_output.WriteLine("==== missing assemblies from the framework ====");
5359
_output.WriteLine(string.Join('\n', missing));
@@ -59,7 +65,7 @@ public void TargetingPackContainsListedAssemblies()
5965
}
6066

6167
[Fact]
62-
public void AssembliesHavePatchVersion0()
68+
public void RefAssembliesHaveExpectedAssemblyVersions()
6369
{
6470
if (!_isTargetingPackBuilding)
6571
{
@@ -71,15 +77,15 @@ public void AssembliesHavePatchVersion0()
7177

7278
Assert.All(dlls, path =>
7379
{
80+
var fileName = Path.GetFileNameWithoutExtension(path);
7481
var assemblyName = AssemblyName.GetAssemblyName(path);
7582
using var fileStream = File.OpenRead(path);
7683
using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
7784
var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
7885
var assemblyDefinition = reader.GetAssemblyDefinition();
7986

80-
Assert.True(
81-
assemblyDefinition.Version.Revision == 0 && assemblyDefinition.Version.Build == 0,
82-
$"{path} has version {assemblyDefinition.Version} should have a 0.0 revision number and build number version, e.g. major.minor.0.0");
87+
TestData.ListedTargetingPackAssemblies.TryGetValue(fileName, out var expectedVersion);
88+
Assert.Equal(expectedVersion, assemblyDefinition.Version.ToString());
8389
});
8490
}
8591

0 commit comments

Comments
 (0)