Skip to content

Commit 44e64ad

Browse files
dotnet-maestro[bot]JamesNKTratcherjaviercnhalter73
authored
[release/7.0-preview7] Update dependencies from dotnet/runtime dotnet/efcore (#42704)
* React to QuicListener API changes * React to QuicException API changes and CertificateChainPolicy * Fix HTTP/3 http.sys tests * React to Quic changes in IIS tests * React to QUIC connection API changes * Qurantine ApplicationInitializationPageIsRequested * Update dependencies from https://github.com/dotnet/runtime build 20220714.6 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.7.22358.7 -> To Version 7.0.0-preview.7.22364.6 * Update dependencies from https://github.com/dotnet/efcore build 20220715.1 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.7.22361.4 -> To Version 7.0.0-preview.7.22365.1 * Update HTTP/3 ServerAbort_ClientReceivesAbort tests * Increase HelixTimeout for ProjectTemplates.Blazor.WebAssembly.Tests to 60 minutes * !fixup! Correct timeout syntax Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: James Newton-King <james@newtonking.com> Co-authored-by: Chris R <Tratcher@outlook.com> Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com> Co-authored-by: Stephen Halter <halter73@gmail.com> Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
1 parent 301829c commit 44e64ad

28 files changed

+431
-471
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/Servers/HttpSys/test/FunctionalTests/Http3Tests.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,9 @@ public async Task Http3_ResetBeforeHeaders()
174174
client.DefaultRequestVersion = HttpVersion.Version30;
175175
client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
176176
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
177-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
178-
Assert.Equal(0x010b, qex.ErrorCode);
177+
var qex = Assert.IsType<QuicException>(ex.InnerException);
178+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
179+
Assert.Equal(0x010b, qex.ApplicationErrorCode.Value);
179180
}
180181

181182
[ConditionalFact]
@@ -206,8 +207,9 @@ public async Task Http3_ResetAfterHeaders()
206207
headersReceived.SetResult();
207208
response.EnsureSuccessStatusCode();
208209
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
209-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
210-
Assert.Equal(0x010c, qex.ErrorCode);
210+
var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
211+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
212+
Assert.Equal(0x010c, qex.ApplicationErrorCode.Value);
211213
}
212214

213215
[ConditionalFact]
@@ -231,8 +233,9 @@ public async Task Http3_AppExceptionAfterHeaders_InternalError()
231233
headersReceived.SetResult();
232234
response.EnsureSuccessStatusCode();
233235
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
234-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
235-
Assert.Equal(0x0102, qex.ErrorCode); // H3_INTERNAL_ERROR
236+
var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
237+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
238+
Assert.Equal(0x0102, qex.ApplicationErrorCode.Value); // H3_INTERNAL_ERROR
236239
}
237240

238241
[ConditionalFact]
@@ -251,7 +254,8 @@ public async Task Http3_Abort_Cancel()
251254
client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
252255

253256
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
254-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
255-
Assert.Equal(0x010c, qex.ErrorCode); // H3_REQUEST_CANCELLED
257+
var qex = Assert.IsType<QuicException>(ex.InnerException);
258+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
259+
Assert.Equal(0x010c, qex.ApplicationErrorCode.Value); // H3_REQUEST_CANCELLED
256260
}
257261
}

‎src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<TestGroupName>HttpSys.FunctionalTests</TestGroupName>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7+
<!-- Required for System.Net.Quic which has a preview API in .NET 7 -->
8+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
79
</PropertyGroup>
810

911
<ItemGroup>

‎src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http3Tests.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ public async Task Http3_ResetBeforeHeaders()
120120
client.DefaultRequestVersion = HttpVersion.Version30;
121121
client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
122122
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
123-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
124-
Assert.Equal(0x010b, qex.ErrorCode);
123+
var qex = Assert.IsType<QuicException>(ex.InnerException);
124+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
125+
Assert.Equal(0x010b, qex.ApplicationErrorCode.Value);
125126
}
126127

127128
[ConditionalFact]
@@ -135,8 +136,9 @@ public async Task Http3_ResetAfterHeaders()
135136
await client.GetAsync(Fixture.Client.BaseAddress.ToString() + "Http3_ResetAfterHeaders_SetResult");
136137
response.EnsureSuccessStatusCode();
137138
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
138-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
139-
Assert.Equal(0x010c, qex.ErrorCode); // H3_REQUEST_CANCELLED
139+
var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
140+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
141+
Assert.Equal(0x010c, qex.ApplicationErrorCode.Value); // H3_REQUEST_CANCELLED
140142
}
141143

142144
[ConditionalFact]
@@ -151,8 +153,9 @@ public async Task Http3_AppExceptionAfterHeaders_InternalError()
151153
await client.GetAsync(Fixture.Client.BaseAddress.ToString() + "Http3_AppExceptionAfterHeaders_InternalError_SetResult");
152154
response.EnsureSuccessStatusCode();
153155
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
154-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
155-
Assert.Equal(0x0102, qex.ErrorCode); // H3_INTERNAL_ERROR
156+
var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
157+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
158+
Assert.Equal(0x0102, qex.ApplicationErrorCode.Value); // H3_INTERNAL_ERROR
156159
}
157160

158161
[ConditionalFact]
@@ -164,8 +167,9 @@ public async Task Http3_Abort_Cancel()
164167
client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
165168

166169
var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
167-
var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
168-
Assert.Equal(0x010c, qex.ErrorCode); // H3_REQUEST_CANCELLED
170+
var qex = Assert.IsType<QuicException>(ex.InnerException);
171+
Assert.Equal(QuicError.StreamAborted, qex.QuicError);
172+
Assert.Equal(0x010c, qex.ApplicationErrorCode.Value); // H3_REQUEST_CANCELLED
169173
}
170174

171175
private HttpClient SetUpClient()

‎src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -7,6 +7,8 @@
77
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
88
<SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10+
<!-- Required for System.Net.Quic which has a preview API in .NET 7 -->
11+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1012
</PropertyGroup>
1113

1214
<Import Project="../FunctionalTest.props" />

‎src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ await RunTest(baseDeploymentParameters, async result =>
5656
[RequiresNewHandler]
5757
[InlineData(HostingModel.InProcess)]
5858
[InlineData(HostingModel.OutOfProcess)]
59+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/42658")]
5960
public async Task ApplicationInitializationPageIsRequested(HostingModel hostingModel)
6061
{
6162
// This test often hits a memory leak in warmup.dll module, it has been reported to IIS team

‎src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ internal static SslServerAuthenticationOptions CloneSslOptions(SslServerAuthenti
194194
ServerCertificate = sslOptions.ServerCertificate,
195195
ServerCertificateContext = sslOptions.ServerCertificateContext,
196196
ServerCertificateSelectionCallback = sslOptions.ServerCertificateSelectionCallback,
197+
CertificateChainPolicy = sslOptions.CertificateChainPolicy,
197198
};
198199

199200
private sealed class SniOptions

‎src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,8 @@ public void CloneSslOptionsClonesAllProperties()
794794
ServerCertificateContext = SslStreamCertificateContext.Create(_x509Certificate2, additionalCertificates: null, offline: true),
795795
// Defaults to null
796796
ServerCertificateSelectionCallback = (sender, serverName) => null,
797+
// Defaults to null
798+
CertificateChainPolicy = new X509ChainPolicy(),
797799
};
798800

799801
var clonedOptions = SniOptionsSelector.CloneSslOptions(options);
@@ -836,6 +838,9 @@ public void CloneSslOptionsClonesAllProperties()
836838
Assert.Same(options.ServerCertificateSelectionCallback, clonedOptions.ServerCertificateSelectionCallback);
837839
Assert.True(propertyNames.Remove(nameof(options.ServerCertificateSelectionCallback)));
838840

841+
Assert.Same(options.CertificateChainPolicy, clonedOptions.CertificateChainPolicy);
842+
Assert.True(propertyNames.Remove(nameof(options.CertificateChainPolicy)));
843+
839844
// Ensure we've checked every property. When new properties get added, we'll have to update this test along with the CloneSslOptions implementation.
840845
Assert.Empty(propertyNames);
841846
}

‎src/Servers/Kestrel/Kestrel.slnf‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@
22
"solution": {
33
"path": "..\\..\\..\\AspNetCore.sln",
44
"projects": [
5-
"src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
6-
"src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
7-
"src\\DataProtection\\DataProtection\\src\\Microsoft.AspNetCore.DataProtection.csproj",
8-
"src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj",
95
"src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
106
"src\\Extensions\\Features\\test\\Microsoft.Extensions.Features.Tests.csproj",
117
"src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
128
"src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
139
"src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
14-
"src\\Http\\Authentication.Abstractions\\src\\Microsoft.AspNetCore.Authentication.Abstractions.csproj",
15-
"src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
1610
"src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
1711
"src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
1812
"src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
@@ -27,13 +21,8 @@
2721
"src\\Middleware\\HostFiltering\\src\\Microsoft.AspNetCore.HostFiltering.csproj",
2822
"src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
2923
"src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
30-
"src\\Security\\Authentication\\Core\\src\\Microsoft.AspNetCore.Authentication.csproj",
3124
"src\\Security\\Authorization\\Core\\src\\Microsoft.AspNetCore.Authorization.csproj",
32-
"src\\Security\\Authorization\\Policy\\src\\Microsoft.AspNetCore.Authorization.Policy.csproj",
3325
"src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
34-
"src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj",
35-
"src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj",
36-
"src\\Servers\\IIS\\IIS\\src\\Microsoft.AspNetCore.Server.IIS.csproj",
3726
"src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
3827
"src\\Servers\\Kestrel\\Core\\test\\Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj",
3928
"src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
@@ -56,8 +45,7 @@
5645
"src\\Servers\\Kestrel\\test\\Sockets.BindTests\\Sockets.BindTests.csproj",
5746
"src\\Servers\\Kestrel\\test\\Sockets.FunctionalTests\\Sockets.FunctionalTests.csproj",
5847
"src\\Servers\\Kestrel\\tools\\CodeGenerator\\CodeGenerator.csproj",
59-
"src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj",
60-
"src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
48+
"src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
6149
]
6250
}
6351
}

0 commit comments

Comments
 (0)