From 2deb0c0d4f58a507082c573507e661a9d8d7f2dd Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 30 Jun 2023 16:33:00 +0200 Subject: [PATCH] Revert "[main] Update dependencies from dotnet/runtime (#49075)" This reverts commit d07f4d43aa93d91dd2db65daaffbf37ce0012841. --- eng/Version.Details.xml | 276 +++++++++--------- eng/Versions.props | 138 ++++----- .../Core/src/Internal/SniOptionsSelector.cs | 1 - .../Core/test/SniOptionsSelectorTests.cs | 5 - 4 files changed, 207 insertions(+), 213 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d3645702505..6c4cac47887b 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 - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 https://github.com/dotnet/source-build-externals 0d04efdab9f26bad07edc881dc7fa088337b8562 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 https://github.com/dotnet/xdt @@ -355,9 +355,9 @@ - + https://github.com/dotnet/runtime - c88b3776d0fb3bb33fcd4192b476147c0895bd6f + f0b4bb9c627e43f5f750a995a11c8611bbaf26d6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index a0c029f8da52..2a9a2466d1ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,77 +63,77 @@ --> - 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.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.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.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.2 diff --git a/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs b/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs index 08b2d87c5b84..7bc2940945b5 100644 --- a/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs +++ b/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs @@ -199,7 +199,6 @@ 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 3b50522effeb..943cec0b6cf6 100644 --- a/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs +++ b/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs @@ -856,8 +856,6 @@ public void CloneSslOptionsClonesAllProperties() ServerCertificateSelectionCallback = (sender, serverName) => null, // Defaults to null CertificateChainPolicy = new X509ChainPolicy(), - // Defaults to true - AllowTlsResume = false, }; var clonedOptions = SniOptionsSelector.CloneSslOptions(options); @@ -903,9 +901,6 @@ 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); }