Skip to content

[release/7.0-preview5] Update dependencies from dotnet/runtime dotnet/efcore #41887

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
merged 11 commits into from
Jun 4, 2022
Merged

[release/7.0-preview5] Update dependencies from dotnet/runtime dotnet/efcore #41887

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
06f378c
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] May 27, 2022
c31923a
Update dependencies from https://github.com/dotnet/efcore build 20220…
dotnet-maestro[bot] May 27, 2022
73e3bb5
Update expected Korean date formatting (dotnet/runtime#69787)
dougbu May 31, 2022
efbfe7b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] May 31, 2022
0414ebb
Update dependencies from https://github.com/dotnet/efcore build 20220…
dotnet-maestro[bot] Jun 1, 2022
fa3af36
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jun 2, 2022
0a6381b
Update dependencies from https://github.com/dotnet/efcore build 20220…
dotnet-maestro[bot] Jun 2, 2022
498d3d7
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jun 2, 2022
ab18773
Update dependencies from https://github.com/dotnet/efcore build 20220…
dotnet-maestro[bot] Jun 2, 2022
5cef883
Skip failing template tests (#41936)
MackinnonBuck May 31, 2022
feb0221
Quarantine a couple of tests
dougbu Jun 3, 2022
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
276 changes: 138 additions & 138 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

138 changes: 69 additions & 69 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Components/test/E2ETest/Tests/WebAssemblyICUShardingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void LoadingApp_KoreanLanguage_Works()
Assert.Equal(culture.ToString(), cultureDisplay.Text);

var dateDisplay = Browser.Exists(By.Id("dateTime"));
Assert.Equal("2020. 9. 2. 오전 12:00:00", dateDisplay.Text);
Assert.Equal("2020. 9. 2. 00:00:00", dateDisplay.Text);

var localizedDisplay = Browser.Exists(By.Id("localizedString"));
// The app has a "ko" resx file. This test verifies that we can walk up the culture hierarchy correctly.
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public async Task MvcControllerActionWorks()
Assert.Equal("Hello human", content);
}

[Fact]
[Fact(Skip = "Failing on Windows environments: https://github.com/dotnet/aspnetcore/issues/41937")]
public async Task DefaultEnvironment_Is_Development()
{
// Arrange
Expand Down
1 change: 1 addition & 0 deletions src/ProjectTemplates/test/IdentityUIPackageTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public ITestOutputHelper Output

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public async Task IdentityUIPackage_WorksWithDifferentOptions()
{
var packageOptions = new Dictionary<string, string>();
Expand Down
4 changes: 4 additions & 0 deletions src/ProjectTemplates/test/MvcTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ public ITestOutputHelper Output

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public async Task MvcTemplate_ProgramMainNoAuthCSharp() => await MvcTemplateCore(languageOverride: null, new[] { ArgConstants.UseProgramMain });

private async Task MvcTemplateCore(string languageOverride, string[] args = null)
Expand Down Expand Up @@ -117,12 +119,14 @@ private async Task MvcTemplateCore(string languageOverride, string[] args = null
[InlineData(true)]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task MvcTemplate_IndividualAuth_LocalDb(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);

[ConditionalTheory]
[InlineData(false)]
[InlineData(true)]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task MvcTemplate_IndividualAuth(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);

private async Task MvcTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)
Expand Down
3 changes: 3 additions & 0 deletions src/ProjectTemplates/test/RazorPagesTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public ITestOutputHelper Output

[ConditionalTheory]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
[InlineData(true)]
[InlineData(false)]
public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
Expand Down Expand Up @@ -111,12 +112,14 @@ public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
[InlineData(true)]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task RazorPagesTemplate_IndividualAuth_LocalDb(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);

[ConditionalTheory]
[InlineData(false)]
[InlineData(true)]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task RazorPagesTemplate_IndividualAuth(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);

private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)
Expand Down
4 changes: 4 additions & 0 deletions src/ProjectTemplates/test/WebApiTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,22 @@ public ITestOutputHelper Output

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task WebApiTemplateCSharp() => WebApiTemplateCore(languageOverride: null);

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task WebApiTemplateProgramMainCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain });

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task WebApiTemplateMinimalApisCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseMinimalApis });

[ConditionalFact]
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
public Task WebApiTemplateProgramMainMinimalApisCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.UseMinimalApis });

[ConditionalTheory]
Expand Down
1 change: 1 addition & 0 deletions src/Servers/Kestrel/Transport.Quic/test/QuicConnectionListenerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ static void AssertTlsConnectionFeature(IFeatureCollection features, X509Certific
// https://github.com/dotnet/runtime/issues/57308, RemoteCertificateValidationCallback should allow us to accept a null cert,
// but it doesn't right now.
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41894")]
public async Task ClientCertificate_Required_NotSent_ConnectionAborted()
{
await using var connectionListener = await QuicTestHelpers.CreateConnectionListenerFactory(LoggerFactory, clientCertificateRequired: true);
Expand Down
3 changes: 2 additions & 1 deletion src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ public async Task ClientCertificate_AllowOrRequire_Available_Invalid_Refused(Cli
[ConditionalFact]
[MsQuicSupported]
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/aspnetcore/issues/35800")]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41894")]
public async Task ClientCertificate_Allow_NotAvailable_Optional()
{
var builder = CreateHostBuilder(async context =>
Expand Down Expand Up @@ -253,7 +254,7 @@ public async Task ClientCertificate_Allow_NotAvailable_Optional()

[ConditionalFact]
[MsQuicSupported]
public async Task OnAuthentice_Available_Throws()
public async Task OnAuthenticate_Available_Throws()
{
var builder = CreateHostBuilder(async context =>
{
Expand Down