From b7a403c7537efc8ad8e8f52bcbc786efea011847 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 14 Feb 2023 17:01:27 -0800
Subject: [PATCH 1/3] [release/7.0] Update baselines, et cetera - update
baselines to latest 7.0.x release - enable baseline validation - update the
.NET SDK to the latest 7.0.1xx version - update 6.0.x site extension version
---
eng/Baseline.Designer.props | 506 ++++++++++++++++++------------------
eng/Baseline.xml | 210 +++++++--------
eng/Versions.props | 4 +-
global.json | 4 +-
4 files changed, 362 insertions(+), 362 deletions(-)
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 85bfbc5f8f04..da411aa20037 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,138 +2,138 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
-
-
+
+
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
@@ -141,263 +141,263 @@
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
-
-
+
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
-
+
+
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
-
-
-
+
+
+
- 7.0.2
+ 7.0.3
-
-
-
+
+
+
- 7.0.2
+ 7.0.3
-
-
+
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
-
-
+
+
+
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
-
+
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
@@ -406,15 +406,15 @@
- 0.3.2
+ 0.3.3
-
+
- 7.0.2
+ 7.0.3
@@ -422,71 +422,71 @@
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
-
+
+
-
+
-
-
+
+
- 7.0.2
+ 7.0.3
-
-
+
+
- 7.0.2
+ 7.0.3
-
-
+
+
- 7.0.2
+ 7.0.3
@@ -502,27 +502,27 @@
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
@@ -531,254 +531,254 @@
- 7.0.2
+ 7.0.3
-
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
-
+
+
-
-
+
+
-
-
+
+
- 7.0.2
+ 7.0.3
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- 7.0.2
+ 7.0.3
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
-
-
-
+
+
+
+
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
@@ -794,46 +794,46 @@
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
-
-
+
+
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
@@ -843,7 +843,7 @@
- 7.0.2
+ 7.0.3
@@ -852,73 +852,73 @@
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
@@ -947,35 +947,35 @@
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
-
+
-
+
- 7.0.2
+ 7.0.3
- 7.0.2
+ 7.0.3
-
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 839f499bd11f..a0f8fab4c27d 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,109 +4,109 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index eca9094e1582..4f46f95b37eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
7
0
4
- false
+ true
@@ -238,7 +238,7 @@
5.0.17-servicing-22215-7
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)
- 6.0.13-servicing-22580-13
+ 6.0.14-servicing-23074-3
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)
diff --git a/global.json b/global.json
index 956c20ef2193..f43f7de7a607 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "7.0.102"
+ "version": "7.0.103"
},
"tools": {
- "dotnet": "7.0.102",
+ "dotnet": "7.0.103",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
From 317a8ca664aff9dd64f5ad171c185ed1b609b5c6 Mon Sep 17 00:00:00 2001
From: Safia Abdalla
Date: Tue, 3 Jan 2023 09:18:43 -0800
Subject: [PATCH 2/3] Quarantine Settings_MaxHeaderListSize_Server (#45812)
---
.../test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
index 6ab377f47815..f3930773aa9b 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
@@ -1345,6 +1345,7 @@ public async Task Settings_MaxFrameSize_Larger_Server(string scheme)
[Theory]
[MemberData(nameof(SupportedSchemes))]
+ [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/45811")]
public async Task Settings_MaxHeaderListSize_Server(string scheme)
{
var oneKbString = new string('a', 1024);
From 1d4dd6b395bdf16ccf7f2e9d01df70421a32537e Mon Sep 17 00:00:00 2001
From: Chris Ross
Date: Wed, 4 Jan 2023 15:44:41 -0800
Subject: [PATCH 3/3] React to new HttpClient header size check #45811 (#45880)
---
.../HttpClientHttp2InteropTests.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
index f3930773aa9b..7029c532f15b 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
@@ -1345,7 +1345,6 @@ public async Task Settings_MaxFrameSize_Larger_Server(string scheme)
[Theory]
[MemberData(nameof(SupportedSchemes))]
- [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/45811")]
public async Task Settings_MaxHeaderListSize_Server(string scheme)
{
var oneKbString = new string('a', 1024);
@@ -1354,15 +1353,16 @@ public async Task Settings_MaxHeaderListSize_Server(string scheme)
{
ConfigureKestrel(webHostBuilder, scheme);
webHostBuilder.ConfigureServices(AddTestLogging)
- .Configure(app => app.Run(context => throw new NotImplementedException()));
+ .Configure(app => app.Run(context => context.Response.WriteAsync("Hello World")));
});
using var host = await hostBuilder.StartAsync().DefaultTimeout();
var url = host.MakeUrl(scheme);
using var client = CreateClient();
- // There's no point in waiting for the settings to sync, the client doesn't check the header list size setting.
- // https://github.com/dotnet/runtime/blob/48a78bfa13e9c710851690621fc2c0fe1637802c/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs#L467-L494
+ // Send an initial request to ensure the settings get synced before the real test.
+ var responseBody = await client.GetStringAsync(url).DefaultTimeout();
+ Assert.Equal("Hello World", responseBody);
var request = CreateRequestMessage(HttpMethod.Get, url, content: null);
// The default size limit is 32kb.
@@ -1370,10 +1370,10 @@ public async Task Settings_MaxHeaderListSize_Server(string scheme)
{
request.Headers.Add("header" + i, oneKbString + i);
}
- var response = await client.SendAsync(request).DefaultTimeout();
- await host.StopAsync().DefaultTimeout();
+ var ex = await Assert.ThrowsAsync(() => client.SendAsync(request).DefaultTimeout());
+ Assert.Equal("The HTTP request headers length exceeded the server limit of 32768 bytes.", ex.Message);
- Assert.Equal(HttpStatusCode.RequestHeaderFieldsTooLarge, response.StatusCode);
+ await host.StopAsync().DefaultTimeout();
}
[Theory]