diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4d514c723f..2e6048a4b7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -41,260 +41,260 @@
https://github.com/dotnet/efcore
4795eee89fd67a05ae3aa288509c57200f0d7c89
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
-
+
https://github.com/dotnet/runtime
- 98b6284e020845c04bc7b1cefdcd01ffe7a4a8c0
+ 2d0249e7ae75647c313623b7322cd71a72870deb
https://github.com/dotnet/arcade
diff --git a/eng/Versions.props b/eng/Versions.props
index 505edcc2ca..07bdb0e8d1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -66,69 +66,69 @@
3.7.0-4.20319.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
- 5.0.0-preview.8.20328.6
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
+ 5.0.0-preview.8.20330.14
- 5.0.0-preview.8.20328.6
+ 5.0.0-preview.8.20330.14
3.2.0
diff --git a/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs b/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs
index 0591abdce6..ed0c103006 100644
--- a/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs
+++ b/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs
@@ -80,7 +80,9 @@ namespace Microsoft.AspNetCore.Http
{ Encoding.BigEndianUnicode },
{ Encoding.Unicode },
{ Encoding.UTF32 },
+#pragma warning disable CS0618, MSLIB0001 // Type or member is obsolete
{ Encoding.UTF7 },
+#pragma warning restore CS0618, MSLIB0001 // Type or member is obsolete
{ Encoding.UTF8 }
};
diff --git a/src/Http/Http/src/Features/FormFeature.cs b/src/Http/Http/src/Features/FormFeature.cs
index c5a288e0bb..d7f1888139 100644
--- a/src/Http/Http/src/Features/FormFeature.cs
+++ b/src/Http/Http/src/Features/FormFeature.cs
@@ -276,7 +276,9 @@ namespace Microsoft.AspNetCore.Http.Features
private static Encoding FilterEncoding(Encoding? encoding)
{
// UTF-7 is insecure and should not be honored. UTF-8 will succeed for most cases.
+#pragma warning disable CS0618, MSLIB0001 // Type or member is obsolete
if (encoding == null || Encoding.UTF7.Equals(encoding))
+#pragma warning restore CS0618, MSLIB0001 // Type or member is obsolete
{
return Encoding.UTF8;
}
diff --git a/src/Http/WebUtilities/src/FormPipeReader.cs b/src/Http/WebUtilities/src/FormPipeReader.cs
index 3ce6e03b29..bcb553458d 100644
--- a/src/Http/WebUtilities/src/FormPipeReader.cs
+++ b/src/Http/WebUtilities/src/FormPipeReader.cs
@@ -47,8 +47,10 @@ namespace Microsoft.AspNetCore.WebUtilities
public FormPipeReader(PipeReader pipeReader, Encoding encoding)
{
+#pragma warning disable CS0618, MSLIB0001 // Type or member is obsolete
if (encoding == Encoding.UTF7)
{
+#pragma warning restore CS0618, MSLIB0001 // Type or member is obsolete
throw new ArgumentException("UTF7 is unsupported and insecure. Please select a different encoding.");
}
diff --git a/src/Http/WebUtilities/src/MultipartSectionStreamExtensions.cs b/src/Http/WebUtilities/src/MultipartSectionStreamExtensions.cs
index f0a51656ad..58c16bd605 100644
--- a/src/Http/WebUtilities/src/MultipartSectionStreamExtensions.cs
+++ b/src/Http/WebUtilities/src/MultipartSectionStreamExtensions.cs
@@ -34,20 +34,22 @@ namespace Microsoft.AspNetCore.WebUtilities
MediaTypeHeaderValue.TryParse(section.ContentType, out var sectionMediaType);
var streamEncoding = sectionMediaType?.Encoding;
+#pragma warning disable CS0618, MSLIB0001 // Type or member is obsolete
if (streamEncoding == null || streamEncoding == Encoding.UTF7)
+#pragma warning restore CS0618, MSLIB0001 // Type or member is obsolete
{
streamEncoding = Encoding.UTF8;
}
using (var reader = new StreamReader(
- section.Body,
+ section.Body,
streamEncoding,
detectEncodingFromByteOrderMarks: true,
- bufferSize: 1024,
+ bufferSize: 1024,
leaveOpen: true))
{
return await reader.ReadToEndAsync();
}
- }
+ }
}
}
diff --git a/src/Mvc/Mvc.Core/test/ContentResultTest.cs b/src/Mvc/Mvc.Core/test/ContentResultTest.cs
index a9b044cb2c..afe9675a69 100644
--- a/src/Mvc/Mvc.Core/test/ContentResultTest.cs
+++ b/src/Mvc/Mvc.Core/test/ContentResultTest.cs
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Mvc
Content = null,
ContentType = new MediaTypeHeaderValue("text/plain")
{
- Encoding = Encoding.UTF7
+ Encoding = Encoding.Unicode
}.ToString()
};
var httpContext = GetHttpContext();
@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Mvc
await contentResult.ExecuteResultAsync(actionContext);
// Assert
- MediaTypeAssert.Equal("text/plain; charset=utf-7", httpContext.Response.ContentType);
+ MediaTypeAssert.Equal("text/plain; charset=utf-16", httpContext.Response.ContentType);
}
public static TheoryData ContentResultContentTypeData
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs
index ca92aba1b6..6762102451 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs
@@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
// Arrange
var requestMessage = new HttpRequestMessage(HttpMethod.Post, "/contact")
{
- Content = new StringContent("some content", Encoding.UTF7, "application/json"),
+ Content = new StringContent("some content", Encoding.Latin1, "application/json"),
};
// Act