diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adef15da3f24..a6e4cfcf233d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,288 +41,288 @@ https://github.com/dotnet/efcore 81c2440d848ecfe2ad9b8147150d607526d036b8 - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f https://github.com/dotnet/source-build-externals 0d04efdab9f26bad07edc881dc7fa088337b8562 - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f https://github.com/dotnet/xdt @@ -355,9 +355,9 @@ - + https://github.com/dotnet/runtime - f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 + c88b3776d0fb3bb33fcd4192b476147c0895bd6f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3a099f645a37..d867170ec31b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,77 +63,77 @@ --> - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 - 8.0.0-preview.7.23326.5 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 + 8.0.0-preview.7.23328.11 8.0.0-preview.7.23326.2 diff --git a/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs b/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs index 7bc2940945b5..08b2d87c5b84 100644 --- a/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs +++ b/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs @@ -199,6 +199,7 @@ internal static SslServerAuthenticationOptions CloneSslOptions(SslServerAuthenti ServerCertificateContext = sslOptions.ServerCertificateContext, ServerCertificateSelectionCallback = sslOptions.ServerCertificateSelectionCallback, CertificateChainPolicy = sslOptions.CertificateChainPolicy, + AllowTlsResume = sslOptions.AllowTlsResume, }; private sealed class SniOptions diff --git a/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs b/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs index 943cec0b6cf6..3b50522effeb 100644 --- a/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs +++ b/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs @@ -856,6 +856,8 @@ public void CloneSslOptionsClonesAllProperties() ServerCertificateSelectionCallback = (sender, serverName) => null, // Defaults to null CertificateChainPolicy = new X509ChainPolicy(), + // Defaults to true + AllowTlsResume = false, }; var clonedOptions = SniOptionsSelector.CloneSslOptions(options); @@ -901,6 +903,9 @@ public void CloneSslOptionsClonesAllProperties() Assert.Same(options.CertificateChainPolicy, clonedOptions.CertificateChainPolicy); Assert.True(propertyNames.Remove(nameof(options.CertificateChainPolicy))); + Assert.Equal(options.AllowTlsResume, clonedOptions.AllowTlsResume); + Assert.True(propertyNames.Remove(nameof(options.AllowTlsResume))); + // 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); }