Revert "System.IO.Pipelines Fix"

This reverts commit 520b9e2.

Author: TanayParikh

eng/SharedFramework.External.props

@@ -40,7 +40,6 @@
     <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)" />
 
     <!--

src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj

@@ -14,7 +14,6 @@
     <Reference Include="Microsoft.AspNetCore.Components.Forms" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.JSInterop" />
-    <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
 </Project>

src/Framework/test/TestData.cs

@@ -143,7 +143,6 @@ 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",
@@ -275,7 +274,6 @@ 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" },

src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj

@@ -10,8 +10,12 @@
 
   <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>

src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj

@@ -14,7 +14,15 @@
 
   <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>

src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj

@@ -19,7 +19,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.Net.Http.Headers" />
-    <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
 </Project>

src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj

@@ -25,7 +25,7 @@
 
   <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
     <!--
-      Dependency (a transitive reference) was removed in 5.0. Suppression can be
+      Dependency (now in shared Fx and a transitive ref for netstandard2.x) was removed in 5.0. Suppression can be
       removed after 5.0 RTM is released.
     -->
     <SuppressBaselineReference Include="System.IO.Pipelines" />

src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj

@@ -41,7 +41,6 @@
     <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>
 

src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj

@@ -20,7 +20,6 @@
     <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>
 

src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj

@@ -35,7 +35,6 @@
 
   <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" />