diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index d9914be2e486..a43f82e80353 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -40,6 +40,7 @@ + - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 - + https://github.com/dotnet/runtime - e6b9b48f3466c25e17509137e3931229f406b425 + 1e09ff6d32c951b55bf9e01e6f3a3a846c0acc73 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 17e2829eb3d8..fcc190377bb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,85 +64,85 @@ 3.8.0-2.20428.3 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 - 6.0.0-alpha.1.20428.2 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 + 6.0.0-alpha.1.20459.20 - 6.0.0-alpha.1.20428.2 + 6.0.0-alpha.1.20459.20 3.2.0 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 - 6.0.0-alpha.1.20426.2 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 + 6.0.0-alpha.1.20459.3 5.0.0-beta.20452.19 diff --git a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj index 39db3a0be973..6c1eaeb1ff64 100644 --- a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj +++ b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs index 538086f29cdd..a90608b89181 100644 --- a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs +++ b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs @@ -9,6 +9,7 @@ using System.Net.Http; using System.Runtime.InteropServices; using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; @@ -20,7 +21,7 @@ public class TargetPickerUi { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, PropertyNameCaseInsensitive = true, - IgnoreNullValues = true + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }; private string _browserHost; diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs index 786a4ee2e97a..2271d24ece6f 100644 --- a/src/Framework/test/TestData.cs +++ b/src/Framework/test/TestData.cs @@ -143,6 +143,7 @@ static TestData() "Microsoft.Win32.SystemEvents", "System.Diagnostics.EventLog", "System.Drawing.Common", + "System.IO.Pipelines", "System.Security.Cryptography.Pkcs", "System.Security.Cryptography.Xml", "System.Security.Permissions", @@ -274,6 +275,7 @@ static TestData() { "Microsoft.Net.Http.Headers", "5.0.0.0" }, { "Microsoft.Win32.Registry", "5.0.0.0" }, { "System.Diagnostics.EventLog", "5.0.0.0" }, + { "System.IO.Pipelines", "5.0.0.0" }, { "System.Security.AccessControl", "5.0.0.0" }, { "System.Security.Cryptography.Cng", "5.0.0.0" }, { "System.Security.Cryptography.Xml", "5.0.0.0" }, diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj index 45f833b2f3c3..d91a72748dec 100644 --- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj @@ -10,12 +10,8 @@ + - - - - - diff --git a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj index d6e93d7b0212..dda22adeabb8 100644 --- a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj @@ -14,15 +14,7 @@ - - - - - - - - diff --git a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj index ac568dc32fba..d165fe972721 100644 --- a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj @@ -19,6 +19,7 @@ + diff --git a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj index b9614fcb0221..dda00cbf9235 100644 --- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -25,7 +25,7 @@ diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs index 629b689a6d8e..8cfee06f1f48 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs @@ -49,8 +49,10 @@ public async Task ResponseHeaders_ServerSendsSingleValueKnownHeaders_Success() return Task.FromResult(0); })) { - // HttpClient would merge the headers no matter what + +#pragma warning disable SYSLIB0014 // HttpClient would merge the headers no matter what WebRequest request = WebRequest.Create(address); +#pragma warning restore SYSLIB0014 HttpWebResponse response = (HttpWebResponse)await request.GetResponseAsync(); Assert.Equal(4, response.Headers.Count); Assert.Null(response.Headers["Transfer-Encoding"]); @@ -73,8 +75,9 @@ public async Task ResponseHeaders_ServerSendsMultiValueKnownHeaders_Success() return Task.FromResult(0); })) { - // HttpClient would merge the headers no matter what +#pragma warning disable SYSLIB0014 // HttpClient would merge the headers no matter what WebRequest request = WebRequest.Create(address); +#pragma warning restore SYSLIB0014 HttpWebResponse response = (HttpWebResponse)await request.GetResponseAsync(); Assert.Equal(4, response.Headers.Count); Assert.Null(response.Headers["Transfer-Encoding"]); @@ -97,8 +100,9 @@ public async Task ResponseHeaders_ServerSendsCustomHeaders_Success() return Task.FromResult(0); })) { - // HttpClient would merge the headers no matter what +#pragma warning disable SYSLIB0014 // HttpClient would merge the headers no matter what WebRequest request = WebRequest.Create(address); +#pragma warning restore SYSLIB0014 HttpWebResponse response = (HttpWebResponse)await request.GetResponseAsync(); Assert.Equal(4, response.Headers.Count); Assert.Null(response.Headers["Transfer-Encoding"]); diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index de559faf6d26..d262f5cd0b44 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -41,6 +41,7 @@ + diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj index b76aa029d628..addaf56ff283 100644 --- a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -20,6 +20,7 @@ + diff --git a/src/Shared/Components/ServerComponentSerializationSettings.cs b/src/Shared/Components/ServerComponentSerializationSettings.cs index db061bf52a46..abc10b577a81 100644 --- a/src/Shared/Components/ServerComponentSerializationSettings.cs +++ b/src/Shared/Components/ServerComponentSerializationSettings.cs @@ -3,6 +3,7 @@ using System; using System.Text.Json; +using System.Text.Json.Serialization; namespace Microsoft.AspNetCore.Components { @@ -15,7 +16,7 @@ internal static class ServerComponentSerializationSettings { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, PropertyNameCaseInsensitive = true, - IgnoreNullValues = true + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }; // This setting is not configurable, but realistically we don't expect an app to take more than 30 seconds from when diff --git a/src/Shared/Components/WebAssemblyComponentSerializationSettings.cs b/src/Shared/Components/WebAssemblyComponentSerializationSettings.cs index 741ab989d594..ab38e863a68b 100644 --- a/src/Shared/Components/WebAssemblyComponentSerializationSettings.cs +++ b/src/Shared/Components/WebAssemblyComponentSerializationSettings.cs @@ -3,6 +3,7 @@ using System; using System.Text.Json; +using System.Text.Json.Serialization; namespace Microsoft.AspNetCore.Components { @@ -13,7 +14,7 @@ internal static class WebAssemblyComponentSerializationSettings { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, PropertyNameCaseInsensitive = true, - IgnoreNullValues = true + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }; } } diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj index d3bba11e6d5b..c3956a4c1946 100644 --- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj +++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj @@ -35,6 +35,7 @@ +