[master] Update dependencies from dotnet/efcore dotnet/runtime (#25399)

[master] Update dependencies from dotnet/efcore dotnet/runtime - Updating usage of IgnoreNullValues - Updating usage of IgnoreNullValues - Disabling WebRequest.Create warnings - Disabling WebRequest.Create warnings - Merge branch 'master' into darc-master-3b4656f0-1eb1-4628-b310-b71a2b9dd35f - System.IO.Pipelines Fix - CS0618 Disable - SYSLIB0014 Disable - Skip reference check of System.IO.Pipelines ref/ assembly - add Framework projects to solution - add Framework.slnf and startvs.cmd in src/Framework - Merge branch 'master' into darc-master-3b4656f0-1eb1-4628-b310-b71a2b9dd35f - Add incremental build and project references to java projects (#25707) * Add incremental build and project references to java projects * fb * fix version - Merge remote-tracking branch 'origin/master' into darc-master-3b4656f0-1eb1-4628-b310-b71a2b9dd35f
dotnet · Sep 10, 2020 · ee765e7 · ee765e7
1 parent 6de6ba9
commit ee765e7
Show file tree

Hide file tree

Showing 16 changed files with 245 additions and 242 deletions.
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
@@ -40,6 +40,7 @@
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options.DataAnnotations"                 Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options"                                 Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives"                              Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
+    <ExternalAspNetCoreAppReference Include="System.IO.Pipelines"                                          Version="$(SystemIOPipelinesPackageVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml"                             Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
 
     <!--

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj
@@ -14,6 +14,7 @@
     <Reference Include="Microsoft.AspNetCore.Components.Forms" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.JSInterop" />
+    <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
 </Project>
diff --git 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
@@ -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
@@ -10,12 +10,8 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="System.IO.Pipelines" />
     <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
-    <!-- Dependency (now in shared Fx) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
-    <SuppressBaselineReference Include="System.IO.Pipelines" />
-  </ItemGroup>
-
 </Project>
diff --git 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 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.Primitives" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'">
     <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">
-    <!-- Dependency (now in shared Fx) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
-    <SuppressBaselineReference Include="System.IO.Pipelines" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj
@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.Net.Http.Headers" />
+    <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
 </Project>
diff --git a/...Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/...Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
     <!--
-      Dependency (now in shared Fx and a transitive ref for netstandard2.x) was removed in 5.0. Suppression can be
+      Dependency (a transitive reference) was removed in 5.0. Suppression can be
       removed after 5.0 RTM is released.
     -->
     <SuppressBaselineReference Include="System.IO.Pipelines" />

diff --git 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
@@ -41,6 +41,7 @@
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
+    <Reference Include="System.IO.Pipelines" />
     <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 

diff --git 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 @@
     <Reference Include="Microsoft.AspNetCore.HttpOverrides" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
+    <Reference Include="System.IO.Pipelines" />
     <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 

diff --git 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
@@ -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
@@ -35,6 +35,7 @@
 
   <ItemGroup>
     <Reference Include="FSharp.Core" />
+    <Reference Include="System.IO.Pipelines" />
     <Reference Include="System.Reflection.Metadata" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe" />
     <Reference Include="System.Security.Cryptography.Cng" />