Add temporary workaround for internal StreamContent constructor.

(cherry picked from commit 23762ef)
mono · Apr 5, 2019 · 7ecc538 · 7ecc538
1 parent 9eb2dbf
commit 7ecc538
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/external/corefx b/external/corefx
diff --git a/mcs/class/System.Net.Http/StreamContent.Mono.cs b/mcs/class/System.Net.Http/StreamContent.Mono.cs
@@ -0,0 +1,19 @@
+using System.IO;
+using System.Threading;
+
+namespace System.Net.Http
+{
+	partial class StreamContent
+	{
+		//
+		// Workarounds for poor .NET API
+		// Instead of having SerializeToStreamAsync with CancellationToken as public API. Only LoadIntoBufferAsync
+		// called internally from the send worker can be cancelled and user cannot see/do it
+		//
+		[Obsolete ("FIXME: Please talk to Martin about this; see https://github.com/mono/mono/issues/12996.")]
+		internal StreamContent (Stream content, CancellationToken cancellationToken)
+			: this (content)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Net.Http/System.Net.Http.csproj b/mcs/class/System.Net.Http/System.Net.Http.csproj
@@ -604,6 +604,7 @@
             <Compile Include="HttpClientHandler.cs" />
             <Compile Include="IMonoHttpClientHandler.cs" />
             <Compile Include="MonoWebRequestHandler.cs" />
+            <Compile Include="StreamContent.Mono.cs" />
             <Compile Include="corefx\NetEventSource.Http.cs" />
             <Compile Include="corefx\SocketsHttpHandler.Mono.cs" />
           </ItemGroup>
@@ -718,6 +719,7 @@
             <Compile Include="HttpClientHandler.cs" />
             <Compile Include="IMonoHttpClientHandler.cs" />
             <Compile Include="MonoWebRequestHandler.cs" />
+            <Compile Include="StreamContent.Mono.cs" />
             <Compile Include="corefx\NetEventSource.Http.cs" />
             <Compile Include="corefx\SocketsHttpHandler.Mono.cs" />
           </ItemGroup>
@@ -832,6 +834,7 @@
             <Compile Include="HttpClientHandler.cs" />
             <Compile Include="IMonoHttpClientHandler.cs" />
             <Compile Include="MonoWebRequestHandler.cs" />
+            <Compile Include="StreamContent.Mono.cs" />
             <Compile Include="corefx\NetEventSource.Http.cs" />
             <Compile Include="corefx\SocketsHttpHandler.Mono.cs" />
           </ItemGroup>

diff --git a/mcs/class/System.Net.Http/unix_net_4_x_System.Net.Http.dll.sources b/mcs/class/System.Net.Http/unix_net_4_x_System.Net.Http.dll.sources
@@ -5,6 +5,7 @@ HttpClientHandler.cs
 HttpClientHandler.SocketsHandler.cs
 IMonoHttpClientHandler.cs
 MonoWebRequestHandler.cs
+StreamContent.Mono.cs
 
 ../corlib/System.Diagnostics/Debug.cs