Skip to content

[automated] Merge branch 'release/3.1' => 'master' #23939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
11 commits merged into from
Jul 15, 2020
Merged

[automated] Merge branch 'release/3.1' => 'master' #23939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
53595a9
Merged PR 8353: [internal/release/3.1] Update dependencies from dncen…
dotnet-bot Jun 17, 2020
62c098b
Merged PR 8358: [internal/release/3.1] Update dependencies from dncen…
dotnet-bot Jun 17, 2020
ef80c15
Update nuget.config
wtgodbe Jul 14, 2020
9cae8dc
Update branding 3.1.7
wtgodbe Jul 14, 2020
aa8707d
Update baseline
wtgodbe Jul 14, 2020
dd16bf5
Fix Baseline.xml version updates (#23545)
Jul 14, 2020
4db94ff
Merge pull request #23930 from dotnet/wtgodbe/317
wtgodbe Jul 14, 2020
d45e6b2
Fix AzureAd options validation (#23096)
Jul 15, 2020
d101de8
Add sharedfx and targeting pack tests (#23045) (#23070)
Jul 15, 2020
a494961
Merge branch 'master' into merge/release/3.1-to-master
Jul 15, 2020
028cb6b
Remove duplicate test added automatically by merge
Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
464 changes: 232 additions & 232 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

162 changes: 81 additions & 81 deletions eng/Baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.

-->
<Baseline Version="3.1.5">
<Baseline Version="3.1.6">
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
<Package Id="dotnet-sql-cache" Version="3.1.5" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.5" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.5" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.5" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.5" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.5" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.5" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.5" />
<Package Id="dotnet-sql-cache" Version="3.1.6" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.6" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.6" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.6" />
</Baseline>
2 changes: 1 addition & 1 deletion eng/tools/BaselineGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ private async Task<int> RunUpdateAsync(
var versionAttribute = document.Root.Attribute("Version");
hasChanged = await TryUpdateVersionAsync(
versionAttribute,
"Microsoft.AspNetCore.App",
"Microsoft.AspNetCore.App.Runtime.win-x64",
packageMetadataResource,
logger,
cacheContext);
Expand Down
5 changes: 5 additions & 0 deletions src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ public AzureADOpenIdConnectOptionsConfiguration(IOptions<AzureADSchemeOptions> s
public void Configure(string name, OpenIdConnectOptions options)
{
var azureADScheme = GetAzureADScheme(name);
if (azureADScheme is null)
{
return;
}

var azureADOptions = _azureADOptions.Get(azureADScheme);
if (name != azureADOptions.OpenIdConnectSchemeName)
{
Expand Down
20 changes: 20 additions & 0 deletions ...ure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,5 +485,25 @@ public void AddAzureADBearer_SkipsOptionsValidationForNonAzureCookies()

Assert.NotNull(jwtOptions.Get("other"));
}

[Fact]
public void AddAzureAD_SkipsOptionsValidationForNonAzureOpenIdConnect()
{
var services = new ServiceCollection();
services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());

services.AddAuthentication()
.AddAzureAD(o => { })
.AddOpenIdConnect("other", null, o =>
{
o.ClientId = "ClientId";
o.Authority = "https://authority.com";
});

var provider = services.BuildServiceProvider();
var openIdConnectOptions = provider.GetService<IOptionsMonitor<OpenIdConnectOptions>>();

Assert.NotNull(openIdConnectOptions.Get("other"));
}
}
}
20 changes: 13 additions & 7 deletions src/Framework/test/TargetingPackTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,23 @@ public TargetingPackTests(ITestOutputHelper output)
[Fact]
public void TargetingPackContainsListedAssemblies()
{
if (!_isTargetingPackBuilding)
{
return;
}

var actualAssemblies = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll")
.Select(Path.GetFileNameWithoutExtension)
.ToHashSet();
var listedTargetingPackAssemblies = TestData.ListedTargetingPackAssemblies.Keys.ToHashSet();

_output.WriteLine("==== actual assemblies ====");
_output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
_output.WriteLine("==== expected assemblies ====");
_output.WriteLine(string.Join('\n', TestData.ListedTargetingPackAssemblies.OrderBy(i => i)));
_output.WriteLine(string.Join('\n', listedTargetingPackAssemblies.OrderBy(i => i)));

var missing = TestData.ListedTargetingPackAssemblies.Except(actualAssemblies);
var unexpected = actualAssemblies.Except(TestData.ListedTargetingPackAssemblies);
var missing = listedTargetingPackAssemblies.Except(actualAssemblies);
var unexpected = actualAssemblies.Except(listedTargetingPackAssemblies);

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

[Fact]
public void AssembliesHavePatchVersion0()
public void RefAssembliesHaveExpectedAssemblyVersions()
{
if (!_isTargetingPackBuilding)
{
Expand All @@ -71,15 +77,15 @@ public void AssembliesHavePatchVersion0()

Assert.All(dlls, path =>
{
var fileName = Path.GetFileNameWithoutExtension(path);
var assemblyName = AssemblyName.GetAssemblyName(path);
using var fileStream = File.OpenRead(path);
using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
var assemblyDefinition = reader.GetAssemblyDefinition();

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

Expand Down
Loading