Skip to content

Commit 1db74d0

Browse files
BrennanConroyBrennanConroy
authored
Merge branch 'release/6.0' into merge/release/6.0-rc1-to-release/6.0
2 parents 115de74 + fb4dc3c commit 1db74d0

File tree

6 files changed

+282
-241
lines changed

6 files changed

+282
-241
lines changed

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
12-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
12+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
1313
<ValidateBaseline>true</ValidateBaseline>
1414
<!--
1515
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
@@ -65,78 +65,78 @@
6565
-->
6666
<PropertyGroup Label="Automated">
6767
<!-- Packages from dotnet/runtime -->
68-
<MicrosoftExtensionsDependencyModelVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsDependencyModelVersion>
69-
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21420.15</MicrosoftNETCoreAppRefVersion>
70-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21420.15</MicrosoftNETCoreAppRuntimewinx64Version>
71-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-rc.1.21420.15</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-rc.1.21420.15</MicrosoftNETRuntimeWebAssemblySdkVersion>
73-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-rc.1.21420.15</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-rc.1.21420.15</MicrosoftNETCoreBrowserDebugHostTransportVersion>
75-
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsCachingAbstractionsVersion>
76-
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsCachingMemoryVersion>
77-
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationAbstractionsVersion>
78-
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationBinderVersion>
79-
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationCommandLineVersion>
80-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
81-
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationFileExtensionsVersion>
82-
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationIniVersion>
83-
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationJsonVersion>
84-
<MicrosoftExtensionsConfigurationVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationVersion>
85-
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationUserSecretsVersion>
86-
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsConfigurationXmlVersion>
87-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
88-
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsDependencyInjectionVersion>
89-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsFileProvidersAbstractionsVersion>
90-
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsFileProvidersCompositeVersion>
91-
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsFileProvidersPhysicalVersion>
92-
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsFileSystemGlobbingVersion>
93-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
94-
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsHostingAbstractionsVersion>
95-
<MicrosoftExtensionsHostingVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsHostingVersion>
96-
<MicrosoftExtensionsHttpVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsHttpVersion>
97-
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingAbstractionsVersion>
98-
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingConfigurationVersion>
99-
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingConsoleVersion>
100-
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingDebugVersion>
101-
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingEventSourceVersion>
102-
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingEventLogVersion>
103-
<MicrosoftExtensionsLoggingVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingVersion>
104-
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsLoggingTraceSourceVersion>
105-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
106-
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107-
<MicrosoftExtensionsOptionsVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsOptionsVersion>
108-
<MicrosoftExtensionsPrimitivesVersion>6.0.0-rc.1.21420.15</MicrosoftExtensionsPrimitivesVersion>
109-
<MicrosoftWin32SystemEventsVersion>6.0.0-rc.1.21420.15</MicrosoftWin32SystemEventsVersion>
110-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rc.1.21420.15</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
111-
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.1.21420.15</SystemDiagnosticsDiagnosticSourceVersion>
112-
<SystemDiagnosticsEventLogVersion>6.0.0-rc.1.21420.15</SystemDiagnosticsEventLogVersion>
113-
<SystemDirectoryServicesProtocolsVersion>6.0.0-rc.1.21420.15</SystemDirectoryServicesProtocolsVersion>
114-
<SystemDrawingCommonVersion>6.0.0-rc.1.21420.15</SystemDrawingCommonVersion>
115-
<SystemIOPipelinesVersion>6.0.0-rc.1.21420.15</SystemIOPipelinesVersion>
116-
<SystemNetHttpJsonVersion>6.0.0-rc.1.21420.15</SystemNetHttpJsonVersion>
117-
<SystemNetHttpWinHttpHandlerVersion>6.0.0-rc.1.21420.15</SystemNetHttpWinHttpHandlerVersion>
118-
<SystemReflectionMetadataVersion>6.0.0-rc.1.21420.15</SystemReflectionMetadataVersion>
119-
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21420.15</SystemResourcesExtensionsVersion>
120-
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.1.21420.15</SystemRuntimeCompilerServicesUnsafeVersion>
121-
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.1.21420.15</SystemSecurityCryptographyPkcsVersion>
122-
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.1.21420.15</SystemSecurityCryptographyXmlVersion>
123-
<SystemSecurityPermissionsVersion>6.0.0-rc.1.21420.15</SystemSecurityPermissionsVersion>
124-
<SystemServiceProcessServiceControllerVersion>6.0.0-rc.1.21420.15</SystemServiceProcessServiceControllerVersion>
125-
<SystemTextEncodingsWebVersion>6.0.0-rc.1.21420.15</SystemTextEncodingsWebVersion>
126-
<SystemTextJsonVersion>6.0.0-rc.1.21420.15</SystemTextJsonVersion>
127-
<SystemThreadingChannelsVersion>6.0.0-rc.1.21420.15</SystemThreadingChannelsVersion>
128-
<SystemWindowsExtensionsVersion>6.0.0-rc.1.21420.15</SystemWindowsExtensionsVersion>
68+
<MicrosoftExtensionsDependencyModelVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsDependencyModelVersion>
69+
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.2.21417.16</MicrosoftNETCoreAppRefVersion>
70+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.2.21417.16</MicrosoftNETCoreAppRuntimewinx64Version>
71+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-rc.2.21417.16</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-rc.2.21417.16</MicrosoftNETRuntimeWebAssemblySdkVersion>
73+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-rc.2.21417.16</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-rc.2.21417.16</MicrosoftNETCoreBrowserDebugHostTransportVersion>
75+
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsCachingAbstractionsVersion>
76+
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsCachingMemoryVersion>
77+
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationAbstractionsVersion>
78+
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationBinderVersion>
79+
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationCommandLineVersion>
80+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
81+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationFileExtensionsVersion>
82+
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationIniVersion>
83+
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationJsonVersion>
84+
<MicrosoftExtensionsConfigurationVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationVersion>
85+
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationUserSecretsVersion>
86+
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsConfigurationXmlVersion>
87+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
88+
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsDependencyInjectionVersion>
89+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsFileProvidersAbstractionsVersion>
90+
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsFileProvidersCompositeVersion>
91+
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsFileProvidersPhysicalVersion>
92+
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsFileSystemGlobbingVersion>
93+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
94+
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsHostingAbstractionsVersion>
95+
<MicrosoftExtensionsHostingVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsHostingVersion>
96+
<MicrosoftExtensionsHttpVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsHttpVersion>
97+
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingAbstractionsVersion>
98+
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingConfigurationVersion>
99+
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingConsoleVersion>
100+
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingDebugVersion>
101+
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingEventSourceVersion>
102+
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingEventLogVersion>
103+
<MicrosoftExtensionsLoggingVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingVersion>
104+
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsLoggingTraceSourceVersion>
105+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
106+
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107+
<MicrosoftExtensionsOptionsVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsOptionsVersion>
108+
<MicrosoftExtensionsPrimitivesVersion>6.0.0-rc.2.21417.16</MicrosoftExtensionsPrimitivesVersion>
109+
<MicrosoftWin32SystemEventsVersion>6.0.0-rc.2.21417.16</MicrosoftWin32SystemEventsVersion>
110+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rc.2.21417.16</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
111+
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.2.21417.16</SystemDiagnosticsDiagnosticSourceVersion>
112+
<SystemDiagnosticsEventLogVersion>6.0.0-rc.2.21417.16</SystemDiagnosticsEventLogVersion>
113+
<SystemDirectoryServicesProtocolsVersion>6.0.0-rc.2.21417.16</SystemDirectoryServicesProtocolsVersion>
114+
<SystemDrawingCommonVersion>6.0.0-rc.2.21417.16</SystemDrawingCommonVersion>
115+
<SystemIOPipelinesVersion>6.0.0-rc.2.21417.16</SystemIOPipelinesVersion>
116+
<SystemNetHttpJsonVersion>6.0.0-rc.2.21417.16</SystemNetHttpJsonVersion>
117+
<SystemNetHttpWinHttpHandlerVersion>6.0.0-rc.2.21417.16</SystemNetHttpWinHttpHandlerVersion>
118+
<SystemReflectionMetadataVersion>6.0.0-rc.2.21417.16</SystemReflectionMetadataVersion>
119+
<SystemResourcesExtensionsVersion>6.0.0-rc.2.21417.16</SystemResourcesExtensionsVersion>
120+
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.2.21417.16</SystemRuntimeCompilerServicesUnsafeVersion>
121+
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.2.21417.16</SystemSecurityCryptographyPkcsVersion>
122+
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.2.21417.16</SystemSecurityCryptographyXmlVersion>
123+
<SystemSecurityPermissionsVersion>6.0.0-rc.2.21417.16</SystemSecurityPermissionsVersion>
124+
<SystemServiceProcessServiceControllerVersion>6.0.0-rc.2.21417.16</SystemServiceProcessServiceControllerVersion>
125+
<SystemTextEncodingsWebVersion>6.0.0-rc.2.21417.16</SystemTextEncodingsWebVersion>
126+
<SystemTextJsonVersion>6.0.0-rc.2.21417.16</SystemTextJsonVersion>
127+
<SystemThreadingChannelsVersion>6.0.0-rc.2.21417.16</SystemThreadingChannelsVersion>
128+
<SystemWindowsExtensionsVersion>6.0.0-rc.2.21417.16</SystemWindowsExtensionsVersion>
129129
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
130-
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21420.15</MicrosoftNETCorePlatformsVersion>
130+
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.2.21417.16</MicrosoftNETCorePlatformsVersion>
131131
<!-- Packages from dotnet/efcore -->
132-
<dotnetefVersion>6.0.0-rc.1.21420.30</dotnetefVersion>
133-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreInMemoryVersion>
134-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreRelationalVersion>
135-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreSqliteVersion>
136-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreSqlServerVersion>
137-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreToolsVersion>
138-
<MicrosoftEntityFrameworkCoreVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreVersion>
139-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-rc.1.21420.30</MicrosoftEntityFrameworkCoreDesignVersion>
132+
<dotnetefVersion>6.0.0-rc.2.21419.15</dotnetefVersion>
133+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreInMemoryVersion>
134+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreRelationalVersion>
135+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreSqliteVersion>
136+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreSqlServerVersion>
137+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreToolsVersion>
138+
<MicrosoftEntityFrameworkCoreVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreVersion>
139+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-rc.2.21419.15</MicrosoftEntityFrameworkCoreDesignVersion>
140140
<!-- Packages from dotnet/arcade -->
141141
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksInstallersVersion>
142142
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksTemplatingVersion>

‎src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOpt
256256
/// <returns>The <see cref="ListenOptions"/>.</returns>
257257
public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOptionsSelectionCallback serverOptionsSelectionCallback, object state, TimeSpan handshakeTimeout)
258258
{
259+
if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))
260+
{
261+
throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(ServerOptionsSelectionCallback)} is not supported with HTTP/3.");
262+
}
259263
return listenOptions.UseHttps(new TlsHandshakeCallbackOptions()
260264
{
261265
OnConnection = context => serverOptionsSelectionCallback(context.SslStream, context.ClientHelloInfo, context.State, context.CancellationToken),
@@ -283,6 +287,11 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, TlsHandsh
283287
throw new ArgumentException($"{nameof(TlsHandshakeCallbackOptions.OnConnection)} must not be null.");
284288
}
285289

290+
if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))
291+
{
292+
throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(TlsHandshakeCallbackOptions)} is not supported with HTTP/3.");
293+
}
294+
286295
var loggerFactory = listenOptions.KestrelServerOptions?.ApplicationServices.GetRequiredService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
287296

288297
listenOptions.IsTls = true;

‎src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,11 @@ private static bool IsWindowsVersionIncompatibleWithHttp2()
510510

511511
internal static SslServerAuthenticationOptions CreateHttp3Options(HttpsConnectionAdapterOptions httpsOptions)
512512
{
513+
if (httpsOptions.OnAuthenticate != null)
514+
{
515+
throw new NotSupportedException($"The {nameof(HttpsConnectionAdapterOptions.OnAuthenticate)} callback is not supported with HTTP/3.");
516+
}
517+
513518
// TODO Set other relevant values on options
514519
var sslServerAuthenticationOptions = new SslServerAuthenticationOptions
515520
{

0 commit comments

Comments
 (0)