[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 <[email protected]>
Co-authored-by: Chris R <[email protected]>
Co-authored-by: Javier Calvarro Nelson <[email protected]>
Co-authored-by: Stephen Halter <[email protected]>
Co-authored-by: Doug Bunting <[email protected]>

Author: 6 people

eng/Version.Details.xml

@@ -174,8 +174,9 @@ public async Task Http3_ResetBeforeHeaders()
         client.DefaultRequestVersion = HttpVersion.Version30;
         client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
-        Assert.Equal(0x010b, qex.ErrorCode);
+        var qex = Assert.IsType<QuicException>(ex.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x010b, qex.ApplicationErrorCode.Value);
     }
 
     [ConditionalFact]
@@ -206,8 +207,9 @@ public async Task Http3_ResetAfterHeaders()
         headersReceived.SetResult();
         response.EnsureSuccessStatusCode();
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
-        Assert.Equal(0x010c, qex.ErrorCode);
+        var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x010c, qex.ApplicationErrorCode.Value);
     }
 
     [ConditionalFact]
@@ -231,8 +233,9 @@ public async Task Http3_AppExceptionAfterHeaders_InternalError()
         headersReceived.SetResult();
         response.EnsureSuccessStatusCode();
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
-        Assert.Equal(0x0102, qex.ErrorCode); // H3_INTERNAL_ERROR
+        var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x0102, qex.ApplicationErrorCode.Value); // H3_INTERNAL_ERROR
     }
 
     [ConditionalFact]
@@ -251,7 +254,8 @@ public async Task Http3_Abort_Cancel()
         client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
 
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
-        Assert.Equal(0x010c, qex.ErrorCode); // H3_REQUEST_CANCELLED
+        var qex = Assert.IsType<QuicException>(ex.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x010c, qex.ApplicationErrorCode.Value); // H3_REQUEST_CANCELLED
     }
 }

eng/Versions.props

@@ -4,6 +4,8 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <TestGroupName>HttpSys.FunctionalTests</TestGroupName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Required for System.Net.Quic which has a preview API in .NET 7 -->
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>

src/Servers/HttpSys/test/FunctionalTests/Http3Tests.cs

@@ -120,8 +120,9 @@ public async Task Http3_ResetBeforeHeaders()
         client.DefaultRequestVersion = HttpVersion.Version30;
         client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
-        Assert.Equal(0x010b, qex.ErrorCode);
+        var qex = Assert.IsType<QuicException>(ex.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x010b, qex.ApplicationErrorCode.Value);
     }
 
     [ConditionalFact]
@@ -135,8 +136,9 @@ public async Task Http3_ResetAfterHeaders()
         await client.GetAsync(Fixture.Client.BaseAddress.ToString() + "Http3_ResetAfterHeaders_SetResult");
         response.EnsureSuccessStatusCode();
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
-        Assert.Equal(0x010c, qex.ErrorCode); // H3_REQUEST_CANCELLED
+        var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x010c, qex.ApplicationErrorCode.Value); // H3_REQUEST_CANCELLED
     }
 
     [ConditionalFact]
@@ -151,8 +153,9 @@ public async Task Http3_AppExceptionAfterHeaders_InternalError()
         await client.GetAsync(Fixture.Client.BaseAddress.ToString() + "Http3_AppExceptionAfterHeaders_InternalError_SetResult");
         response.EnsureSuccessStatusCode();
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => response.Content.ReadAsStringAsync());
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException?.InnerException?.InnerException);
-        Assert.Equal(0x0102, qex.ErrorCode); // H3_INTERNAL_ERROR
+        var qex = Assert.IsType<QuicException>(ex.InnerException?.InnerException?.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x0102, qex.ApplicationErrorCode.Value); // H3_INTERNAL_ERROR
     }
 
     [ConditionalFact]
@@ -164,8 +167,9 @@ public async Task Http3_Abort_Cancel()
         client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact;
 
         var ex = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(address));
-        var qex = Assert.IsType<QuicStreamAbortedException>(ex.InnerException);
-        Assert.Equal(0x010c, qex.ErrorCode); // H3_REQUEST_CANCELLED
+        var qex = Assert.IsType<QuicException>(ex.InnerException);
+        Assert.Equal(QuicError.StreamAborted, qex.QuicError);
+        Assert.Equal(0x010c, qex.ApplicationErrorCode.Value); // H3_REQUEST_CANCELLED
     }
 
     private HttpClient SetUpClient()

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -7,6 +7,8 @@
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
     <SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Required for System.Net.Quic which has a preview API in .NET 7 -->
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <Import Project="../FunctionalTest.props" />

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

@@ -56,6 +56,7 @@ await RunTest(baseDeploymentParameters, async result =>
     [RequiresNewHandler]
     [InlineData(HostingModel.InProcess)]
     [InlineData(HostingModel.OutOfProcess)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/42658")]
     public async Task ApplicationInitializationPageIsRequested(HostingModel hostingModel)
     {
         // This test often hits a memory leak in warmup.dll module, it has been reported to IIS team

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

@@ -194,6 +194,7 @@ internal static SslServerAuthenticationOptions CloneSslOptions(SslServerAuthenti
             ServerCertificate = sslOptions.ServerCertificate,
             ServerCertificateContext = sslOptions.ServerCertificateContext,
             ServerCertificateSelectionCallback = sslOptions.ServerCertificateSelectionCallback,
+            CertificateChainPolicy = sslOptions.CertificateChainPolicy,
         };
 
     private sealed class SniOptions

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

@@ -794,6 +794,8 @@ public void CloneSslOptionsClonesAllProperties()
             ServerCertificateContext = SslStreamCertificateContext.Create(_x509Certificate2, additionalCertificates: null, offline: true),
             // Defaults to null
             ServerCertificateSelectionCallback = (sender, serverName) => null,
+            // Defaults to null
+            CertificateChainPolicy = new X509ChainPolicy(),
         };
 
         var clonedOptions = SniOptionsSelector.CloneSslOptions(options);
@@ -836,6 +838,9 @@ public void CloneSslOptionsClonesAllProperties()
         Assert.Same(options.ServerCertificateSelectionCallback, clonedOptions.ServerCertificateSelectionCallback);
         Assert.True(propertyNames.Remove(nameof(options.ServerCertificateSelectionCallback)));
 
+        Assert.Same(options.CertificateChainPolicy, clonedOptions.CertificateChainPolicy);
+        Assert.True(propertyNames.Remove(nameof(options.CertificateChainPolicy)));
+
         // Ensure we've checked every property. When new properties get added, we'll have to update this test along with the CloneSslOptions implementation.
         Assert.Empty(propertyNames);
     }

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

@@ -2,17 +2,11 @@
   "solution": {
     "path": "..\\..\\..\\AspNetCore.sln",
     "projects": [
-      "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
-      "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
-      "src\\DataProtection\\DataProtection\\src\\Microsoft.AspNetCore.DataProtection.csproj",
-      "src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj",
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\Extensions\\Features\\test\\Microsoft.Extensions.Features.Tests.csproj",
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
       "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
-      "src\\Http\\Authentication.Abstractions\\src\\Microsoft.AspNetCore.Authentication.Abstractions.csproj",
-      "src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
       "src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
       "src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
       "src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
@@ -27,13 +21,8 @@
       "src\\Middleware\\HostFiltering\\src\\Microsoft.AspNetCore.HostFiltering.csproj",
       "src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
       "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
-      "src\\Security\\Authentication\\Core\\src\\Microsoft.AspNetCore.Authentication.csproj",
       "src\\Security\\Authorization\\Core\\src\\Microsoft.AspNetCore.Authorization.csproj",
-      "src\\Security\\Authorization\\Policy\\src\\Microsoft.AspNetCore.Authorization.Policy.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
-      "src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj",
-      "src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj",
-      "src\\Servers\\IIS\\IIS\\src\\Microsoft.AspNetCore.Server.IIS.csproj",
       "src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
       "src\\Servers\\Kestrel\\Core\\test\\Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj",
       "src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
@@ -56,8 +45,7 @@
       "src\\Servers\\Kestrel\\test\\Sockets.BindTests\\Sockets.BindTests.csproj",
       "src\\Servers\\Kestrel\\test\\Sockets.FunctionalTests\\Sockets.FunctionalTests.csproj",
       "src\\Servers\\Kestrel\\tools\\CodeGenerator\\CodeGenerator.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj",
-      "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
     ]
   }
 }