[main] Update dependencies from dotnet/efcore dotnet/runtime

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.2.22114.1"
+    "version": "7.0.100-preview.3.22159.27"
   },
   "tools": {
-    "dotnet": "7.0.100-preview.2.22114.1",
+    "dotnet": "7.0.100-preview.3.22159.27",
     "runtimes": {
       "dotnet": [
         "2.1.30",

src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMisplacedLambdaAttribute.cs

@@ -27,12 +27,12 @@ private static void DetectMisplacedLambdaAttribute(
 
         // () => Hello() has a single child which is a BlockOperation so we check to see if
         // expression associated with that operation is an invocation expression
-        if (lambda.Children.FirstOrDefault().Syntax is InvocationExpressionSyntax innerInvocation)
+        if (lambda.ChildOperations.FirstOrDefault().Syntax is InvocationExpressionSyntax innerInvocation)
         {
             targetInvocation = innerInvocation;
         }
 
-        if (lambda.Children.FirstOrDefault().Children.FirstOrDefault() is IReturnOperation returnOperation
+        if (lambda.ChildOperations.FirstOrDefault().ChildOperations.FirstOrDefault() is IReturnOperation returnOperation
             && returnOperation.ReturnedValue is IInvocationOperation returnedInvocation)
         {
             targetInvocation = (InvocationExpressionSyntax)returnedInvocation.Syntax;

src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs

@@ -133,6 +133,7 @@ public async Task Endpoint_PassesThrough()
     [InlineData("", @"./SubFolder", "", false)]
     [InlineData("", @"./SubFolder", "/你好", false)]
     [InlineData("", @"./SubFolder", "/你好/世界", false)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task FoundDirectoryWithDefaultFile_PathModified_All(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true)
     {
         await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash);
@@ -153,6 +154,7 @@ public async Task FoundDirectoryWithDefaultFile_PathModified_All(string baseUrl,
     [InlineData("", @".\subFolder", "", false)]
     [InlineData("", @".\SubFolder", "/你好", false)]
     [InlineData("", @".\SubFolder", "/你好/世界", false)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task FoundDirectoryWithDefaultFile_PathModified_Windows(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true)
     {
         await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash);
@@ -188,6 +190,7 @@ private async Task FoundDirectoryWithDefaultFile_PathModified(string baseUrl, st
     [InlineData("", @"./", "/SubFolder", "?a=b")]
     [InlineData("", @"./SubFolder", "/你好", "?a=b")]
     [InlineData("", @"./SubFolder", "/你好/世界", "?a=b")]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task NearMatch_RedirectAddSlash_All(string baseUrl, string baseDir, string requestUrl, string queryString)
     {
         await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString);
@@ -200,6 +203,7 @@ public async Task NearMatch_RedirectAddSlash_All(string baseUrl, string baseDir,
     [InlineData("", @".\", "/SubFolder", "?a=b")]
     [InlineData("", @".\SubFolder", "/你好", "?a=b")]
     [InlineData("", @".\SubFolder", "/你好/世界", "?a=b")]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task NearMatch_RedirectAddSlash_Windows(string baseUrl, string baseDir, string requestUrl, string queryString)
     {
         await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString);

src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs

@@ -151,7 +151,9 @@ public async Task DeployTestAndAddToSpec(ServerType server, bool ssl, string env
         // Win7 HttpClient on NetCoreApp2.2 defaults to TLS 1.0 and won't connect to Kestrel. https://github.com/dotnet/corefx/issues/28733
         // Mac HttpClient on NetCoreApp2.0 doesn't alow you to set some combinations.
         // https://github.com/dotnet/corefx/blob/586cffcdfdf23ad6c193a4bf37fce88a1bf69508/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.OSX.cs#L104-L106
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         handler.SslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls;
+#pragma warning restore SYSLIB0039
         handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
         var client = result.CreateHttpClient(handler);
 

src/Servers/HttpSys/src/RequestProcessing/Request.cs

@@ -298,7 +298,8 @@ private void GetTlsHandshakeResults()
         {
             Protocol |= SslProtocols.Ssl3;
         }
-#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning restore CS0618 // Type or Prmember is obsolete
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         if ((Protocol & SslProtocols.Tls) != 0)
         {
             Protocol |= SslProtocols.Tls;
@@ -307,6 +308,7 @@ private void GetTlsHandshakeResults()
         {
             Protocol |= SslProtocols.Tls11;
         }
+#pragma warning restore SYSLIB0039
         if ((Protocol & SslProtocols.Tls12) != 0)
         {
             Protocol |= SslProtocols.Tls12;

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

@@ -532,7 +532,9 @@ public void PrefersSslProtocolsDefinedInSniConfig()
                     "www.example.org",
                     new SniConfig
                     {
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
                         SslProtocols = SslProtocols.Tls13 | SslProtocols.Tls11,
+#pragma warning restore SYSLIB0039
                         Certificate = new CertificateConfig()
                     }
                 }
@@ -550,7 +552,9 @@ public void PrefersSslProtocolsDefinedInSniConfig()
             logger: Mock.Of<ILogger<HttpsConnectionMiddleware>>());
 
         var (options, _) = sniOptionsSelector.GetOptions(new MockConnectionContext(), "www.example.org");
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         Assert.Equal(SslProtocols.Tls13 | SslProtocols.Tls11, options.EnabledSslProtocols);
+#pragma warning restore SYSLIB0039
     }
 
     [Fact]
@@ -690,9 +694,13 @@ public void CloneSslOptionsClonesAllProperties()
             // Defaults to false
             ClientCertificateRequired = true,
             // Defaults to SslProtocols.None
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
             EnabledSslProtocols = SslProtocols.Tls13 | SslProtocols.Tls11,
+#pragma warning restore SYSLIB0039
+#pragma warning disable SYSLIB0040 // EncryptionPolicy.NoEncryption is obsolete
             // Defaults to EncryptionPolicy.RequireEncryption
             EncryptionPolicy = EncryptionPolicy.NoEncryption,
+#pragma warning restore SYSLIB0040
             // Defaults to null
             RemoteCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true,
             // Defaults to null

src/Servers/Kestrel/Kestrel/test/ConfigurationReaderTests.cs

@@ -31,8 +31,8 @@ public void ReadCertificatesWhenEmptyCertificatesSection_ReturnsEmptyCollection(
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Certificates", ""),
-            }).Build();
+            new KeyValuePair<string, string>("Certificates", ""),
+        }).Build();
         var reader = new ConfigurationReader(config);
         var certificates = reader.Certificates;
         Assert.NotNull(certificates);
@@ -44,13 +44,13 @@ public void ReadCertificatesSection_ReturnsCollection()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Certificates:FileCert:Path", "/path/cert.pfx"),
-                new KeyValuePair<string, string>("Certificates:FileCert:Password", "certpassword"),
-                new KeyValuePair<string, string>("Certificates:StoreCert:Subject", "certsubject"),
-                new KeyValuePair<string, string>("Certificates:StoreCert:Store", "certstore"),
-                new KeyValuePair<string, string>("Certificates:StoreCert:Location", "cetlocation"),
-                new KeyValuePair<string, string>("Certificates:StoreCert:AllowInvalid", "true"),
-            }).Build();
+            new KeyValuePair<string, string>("Certificates:FileCert:Path", "/path/cert.pfx"),
+            new KeyValuePair<string, string>("Certificates:FileCert:Password", "certpassword"),
+            new KeyValuePair<string, string>("Certificates:StoreCert:Subject", "certsubject"),
+            new KeyValuePair<string, string>("Certificates:StoreCert:Store", "certstore"),
+            new KeyValuePair<string, string>("Certificates:StoreCert:Location", "cetlocation"),
+            new KeyValuePair<string, string>("Certificates:StoreCert:AllowInvalid", "true"),
+        }).Build();
         var reader = new ConfigurationReader(config);
         var certificates = reader.Certificates;
         Assert.NotNull(certificates);
@@ -76,9 +76,9 @@ public void ReadCertificatesSection_IsCaseInsensitive()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Certificates:filecert:Path", "/path/cert.pfx"),
-                new KeyValuePair<string, string>("CERTIFICATES:FILECERT:PASSWORD", "certpassword"),
-            }).Build();
+            new KeyValuePair<string, string>("Certificates:filecert:Path", "/path/cert.pfx"),
+            new KeyValuePair<string, string>("CERTIFICATES:FILECERT:PASSWORD", "certpassword"),
+        }).Build();
         var reader = new ConfigurationReader(config);
         var certificates = reader.Certificates;
         Assert.NotNull(certificates);
@@ -223,51 +223,57 @@ public void ReadEndpointWithSingleSslProtocolSet_ReturnsCorrectValue()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-                new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:0", "Tls11"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+            new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:0", "Tls11"),
+        }).Build();
         var reader = new ConfigurationReader(config);
 
         var endpoint = reader.Endpoints.First();
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         Assert.Equal(SslProtocols.Tls11, endpoint.SslProtocols);
+#pragma warning restore SYSLIB0039
     }
 
     [Fact]
     public void ReadEndpointWithMultipleSslProtocolsSet_ReturnsCorrectValue()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-                new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:0", "Tls11"),
-                new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:1", "Tls12"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+            new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:0", "Tls11"),
+            new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:1", "Tls12"),
+        }).Build();
         var reader = new ConfigurationReader(config);
 
         var endpoint = reader.Endpoints.First();
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         Assert.Equal(SslProtocols.Tls11 | SslProtocols.Tls12, endpoint.SslProtocols);
+#pragma warning restore SYSLIB0039
     }
 
     [Fact]
     public void ReadEndpointWithSslProtocolSet_ReadsCaseInsensitive()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-                new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:0", "TLS11"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+            new KeyValuePair<string, string>("Endpoints:End1:SslProtocols:0", "TLS11"),
+        }).Build();
         var reader = new ConfigurationReader(config);
 
         var endpoint = reader.Endpoints.First();
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         Assert.Equal(SslProtocols.Tls11, endpoint.SslProtocols);
+#pragma warning restore SYSLIB0039
     }
 
     [Fact]
     public void ReadEndpointWithNoSslProtocolSettings_ReturnsNull()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+        }).Build();
         var reader = new ConfigurationReader(config);
 
         var endpoint = reader.Endpoints.First();
@@ -279,8 +285,8 @@ public void ReadEndpointWithEmptySniSection_ReturnsEmptyCollection()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+        }).Build();
 
         var reader = new ConfigurationReader(config);
 
@@ -294,9 +300,9 @@ public void ReadEndpointWithEmptySniKey_Throws()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-                new KeyValuePair<string, string>("Endpoints:End1:Sni::Protocols", "Http1"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+            new KeyValuePair<string, string>("Endpoints:End1:Sni::Protocols", "Http1"),
+        }).Build();
 
         var reader = new ConfigurationReader(config);
         var end1Ex = Assert.Throws<InvalidOperationException>(() => reader.Endpoints);
@@ -309,13 +315,13 @@ public void ReadEndpointWithSniConfigured_ReturnsCorrectValue()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
-                new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:Protocols", "Http1"),
-                new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:SslProtocols:0", "Tls12"),
-                new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:Certificate:Path", "/path/cert.pfx"),
-                new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:Certificate:Password", "certpassword"),
-                new KeyValuePair<string, string>("Endpoints:End1:SNI:*.example.org:ClientCertificateMode", "AllowCertificate"),
-            }).Build();
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "http://*:5001"),
+            new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:Protocols", "Http1"),
+            new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:SslProtocols:0", "Tls12"),
+            new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:Certificate:Path", "/path/cert.pfx"),
+            new KeyValuePair<string, string>("Endpoints:End1:Sni:*.example.org:Certificate:Password", "certpassword"),
+            new KeyValuePair<string, string>("Endpoints:End1:SNI:*.example.org:ClientCertificateMode", "AllowCertificate"),
+        }).Build();
 
         var reader = new ConfigurationReader(config);
 
@@ -338,12 +344,14 @@ public void ReadEndpointDefaultsWithSingleSslProtocolSet_ReturnsCorrectValue()
     {
         var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
         {
-                new KeyValuePair<string, string>("EndpointDefaults:SslProtocols:0", "Tls11"),
-            }).Build();
+            new KeyValuePair<string, string>("EndpointDefaults:SslProtocols:0", "Tls11"),
+        }).Build();
         var reader = new ConfigurationReader(config);
 
         var endpoint = reader.EndpointDefaults;
+#pragma warning disable SYSLIB0039 // TLS 1.0 and 1.1 are obsolete
         Assert.Equal(SslProtocols.Tls11, endpoint.SslProtocols);
+#pragma warning restore SYSLIB0039
     }
 
     [Fact]