[csproj] Update project files

1 files changed, 315 insertions, 166 deletions

diff --git a/mcs/class/System.Net.Http/System.Net.Http.csproj b/mcs/class/System.Net.Http/System.Net.Http.csproj
index b5d683ba3cf..ccd76ef08cf 100644
--- a/mcs/class/System.Net.Http/System.Net.Http.csproj
+++ b/mcs/class/System.Net.Http/System.Net.Http.csproj
@@ -124,66 +124,117 @@
   <Choose>
     <When Condition="'$(Platform)' == 'xammac'">
       <ItemGroup>
+        <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Http\HttpHandlerDefaults.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ByteArrayContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ByteArrayHelpers.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ClientCertificateOption.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\DelegatingHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\DiagnosticsHandlerLoggingStrings.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\FormUrlEncodedContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\AuthenticationHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\BaseHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ByteArrayHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\CacheControlHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\CacheControlHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ContentDispositionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ContentRangeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\DateHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\EntityTagHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\GenericHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HeaderDescriptor.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HeaderUtilities.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpContentHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpGeneralHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderType.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderValueCollection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpRequestHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpResponseHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\Int32NumberHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\Int64NumberHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\KnownHeader.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\KnownHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\NameValueHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\NameValueWithParametersHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ObjectCollection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductInfoHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductInfoHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeConditionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeItemHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RetryConditionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\StringWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TimeSpanHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\UriHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ViaHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\WarningHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpClient.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpClientHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpCompletionOption.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMessageHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMessageInvoker.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMethod.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpParseResult.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRequestException.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRequestMessage.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpResponseMessage.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRuleParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpUtilities.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MessageProcessingHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MultipartContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MultipartFormDataContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ReadOnlyMemoryContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.Digest.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.NtAuth.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\CancellationHelper.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ChunkedEncodingReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ChunkedEncodingWriteStream.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ConnectHelper.cs" />
-        <Compile Include="HttpClientHandler.Legacy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ConnectionCloseReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ContentLengthReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ContentLengthWriteStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\CookieHelper.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\DecompressionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\EmptyReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpAuthenticatedConnectionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionKind.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionPool.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionPoolManager.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionResponseContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionSettings.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentDuplexStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentWriteStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\RawConnectionStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\RedirectHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\SocketsHttpHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
+        <Compile Include="HttpClientHandler.SocketsHandler.cs" />
         <Compile Include="HttpClientHandler.cs" />
+        <Compile Include="HttpRequestMessage.Mono.cs" />
         <Compile Include="IMonoHttpClientHandler.cs" />
         <Compile Include="MonoWebRequestHandler.cs" />
-        <Compile Include="PlatformHelper.Legacy.cs" />
-        <Compile Include="System.Net.Http.Headers\AuthenticationHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\CacheControlHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\CollectionExtensions.cs" />
-        <Compile Include="System.Net.Http.Headers\CollectionParser.cs" />
-        <Compile Include="System.Net.Http.Headers\ContentDispositionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ContentRangeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\EntityTagHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\HashCodeCalculator.cs" />
-        <Compile Include="System.Net.Http.Headers\HeaderInfo.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpContentHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaderKind.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaderValueCollection.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpRequestHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpResponseHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\Lexer.cs" />
-        <Compile Include="System.Net.Http.Headers\MediaTypeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\MediaTypeWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\NameValueHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\NameValueWithParametersHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\Parser.cs" />
-        <Compile Include="System.Net.Http.Headers\ProductHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ProductInfoHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\QualityValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeConditionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeItemHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RetryConditionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\StringWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\TransferCodingHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\TransferCodingWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ViaHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\WarningHeaderValue.cs" />
-        <Compile Include="System.Net.Http\ByteArrayContent.cs" />
-        <Compile Include="System.Net.Http\ClientCertificateOption.cs" />
-        <Compile Include="System.Net.Http\DelegatingHandler.cs" />
-        <Compile Include="System.Net.Http\FormUrlEncodedContent.cs" />
-        <Compile Include="System.Net.Http\HttpClient.cs" />
+        <Compile Include="PlatformHelper.SocketsHandler.cs" />
         <Compile Include="System.Net.Http\HttpClient.macios.cs" />
-        <Compile Include="System.Net.Http\HttpCompletionOption.cs" />
-        <Compile Include="System.Net.Http\HttpContent.cs" />
-        <Compile Include="System.Net.Http\HttpMessageHandler.cs" />
-        <Compile Include="System.Net.Http\HttpMessageInvoker.cs" />
-        <Compile Include="System.Net.Http\HttpMethod.cs" />
-        <Compile Include="System.Net.Http\HttpRequestException.cs" />
-        <Compile Include="System.Net.Http\HttpRequestMessage.cs" />
-        <Compile Include="System.Net.Http\HttpResponseMessage.cs" />
-        <Compile Include="System.Net.Http\MessageProcessingHandler.cs" />
-        <Compile Include="System.Net.Http\MultipartContent.cs" />
-        <Compile Include="System.Net.Http\MultipartFormDataContent.cs" />
-        <Compile Include="System.Net.Http\StreamContent.cs" />
-        <Compile Include="System.Net.Http\StringContent.cs" />
-        <Compile Include="corefx\ReadOnlyMemoryContent.cs" />
+        <Compile Include="corefx\NetEventSource.Http.cs" />
+        <Compile Include="corefx\SocketsHttpHandler.Mono.cs" />
       </ItemGroup>
     </When>
     <When Condition="'$(Platform)' == 'winaot'">
@@ -622,7 +673,6 @@
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
-            <Compile Include="..\corlib\System.Diagnostics\Debug.cs" />
             <Compile Include="HttpClient.DefaultHandler.cs" />
             <Compile Include="HttpClientHandler.SocketsHandler.cs" />
             <Compile Include="HttpClientHandler.cs" />
@@ -738,7 +788,6 @@
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
-            <Compile Include="..\corlib\System.Diagnostics\Debug.cs" />
             <Compile Include="HttpClient.DefaultHandler.cs" />
             <Compile Include="HttpClientHandler.SocketsHandler.cs" />
             <Compile Include="HttpClientHandler.cs" />
@@ -854,7 +903,6 @@
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
             <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
-            <Compile Include="..\corlib\System.Diagnostics\Debug.cs" />
             <Compile Include="HttpClient.DefaultHandler.cs" />
             <Compile Include="HttpClientHandler.SocketsHandler.cs" />
             <Compile Include="HttpClientHandler.cs" />
@@ -948,130 +996,232 @@
     </When>
     <When Condition="'$(Platform)' == 'monotouch_tv'">
       <ItemGroup>
+        <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Http\HttpHandlerDefaults.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ByteArrayContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ByteArrayHelpers.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ClientCertificateOption.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\DelegatingHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\DiagnosticsHandlerLoggingStrings.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\FormUrlEncodedContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\AuthenticationHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\BaseHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ByteArrayHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\CacheControlHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\CacheControlHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ContentDispositionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ContentRangeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\DateHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\EntityTagHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\GenericHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HeaderDescriptor.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HeaderUtilities.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpContentHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpGeneralHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderType.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderValueCollection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpRequestHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpResponseHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\Int32NumberHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\Int64NumberHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\KnownHeader.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\KnownHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\NameValueHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\NameValueWithParametersHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ObjectCollection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductInfoHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductInfoHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeConditionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeItemHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RetryConditionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\StringWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TimeSpanHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\UriHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ViaHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\WarningHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpClient.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpClientHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpCompletionOption.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMessageHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMessageInvoker.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMethod.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpParseResult.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRequestException.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRequestMessage.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpResponseMessage.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRuleParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpUtilities.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MessageProcessingHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MultipartContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MultipartFormDataContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ReadOnlyMemoryContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.Digest.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.NtAuth.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\CancellationHelper.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ChunkedEncodingReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ChunkedEncodingWriteStream.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ConnectHelper.cs" />
-        <Compile Include="HttpClientHandler.Legacy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ConnectionCloseReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ContentLengthReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ContentLengthWriteStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\CookieHelper.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\DecompressionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\EmptyReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpAuthenticatedConnectionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionKind.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionPool.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionPoolManager.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionResponseContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionSettings.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentDuplexStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentWriteStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\RawConnectionStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\RedirectHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\SocketsHttpHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
+        <Compile Include="HttpClientHandler.SocketsHandler.cs" />
         <Compile Include="HttpClientHandler.cs" />
+        <Compile Include="HttpRequestMessage.Mono.cs" />
         <Compile Include="IMonoHttpClientHandler.cs" />
         <Compile Include="MonoWebRequestHandler.cs" />
-        <Compile Include="PlatformHelper.Legacy.cs" />
-        <Compile Include="System.Net.Http.Headers\AuthenticationHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\CacheControlHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\CollectionExtensions.cs" />
-        <Compile Include="System.Net.Http.Headers\CollectionParser.cs" />
-        <Compile Include="System.Net.Http.Headers\ContentDispositionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ContentRangeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\EntityTagHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\HashCodeCalculator.cs" />
-        <Compile Include="System.Net.Http.Headers\HeaderInfo.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpContentHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaderKind.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaderValueCollection.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpRequestHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpResponseHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\Lexer.cs" />
-        <Compile Include="System.Net.Http.Headers\MediaTypeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\MediaTypeWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\NameValueHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\NameValueWithParametersHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\Parser.cs" />
-        <Compile Include="System.Net.Http.Headers\ProductHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ProductInfoHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\QualityValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeConditionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeItemHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RetryConditionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\StringWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\TransferCodingHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\TransferCodingWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ViaHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\WarningHeaderValue.cs" />
-        <Compile Include="System.Net.Http\ByteArrayContent.cs" />
-        <Compile Include="System.Net.Http\ClientCertificateOption.cs" />
-        <Compile Include="System.Net.Http\DelegatingHandler.cs" />
-        <Compile Include="System.Net.Http\FormUrlEncodedContent.cs" />
-        <Compile Include="System.Net.Http\HttpClient.cs" />
+        <Compile Include="PlatformHelper.SocketsHandler.cs" />
         <Compile Include="System.Net.Http\HttpClient.macios.cs" />
-        <Compile Include="System.Net.Http\HttpCompletionOption.cs" />
-        <Compile Include="System.Net.Http\HttpContent.cs" />
-        <Compile Include="System.Net.Http\HttpMessageHandler.cs" />
-        <Compile Include="System.Net.Http\HttpMessageInvoker.cs" />
-        <Compile Include="System.Net.Http\HttpMethod.cs" />
-        <Compile Include="System.Net.Http\HttpRequestException.cs" />
-        <Compile Include="System.Net.Http\HttpRequestMessage.cs" />
-        <Compile Include="System.Net.Http\HttpResponseMessage.cs" />
-        <Compile Include="System.Net.Http\MessageProcessingHandler.cs" />
-        <Compile Include="System.Net.Http\MultipartContent.cs" />
-        <Compile Include="System.Net.Http\MultipartFormDataContent.cs" />
-        <Compile Include="System.Net.Http\StreamContent.cs" />
-        <Compile Include="System.Net.Http\StringContent.cs" />
-        <Compile Include="corefx\ReadOnlyMemoryContent.cs" />
+        <Compile Include="corefx\NetEventSource.Http.cs" />
+        <Compile Include="corefx\SocketsHttpHandler.Mono.cs" />
       </ItemGroup>
     </When>
     <When Condition="'$(Platform)' == 'monotouch'">
       <ItemGroup>
+        <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Http\HttpHandlerDefaults.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ByteArrayContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ByteArrayHelpers.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ClientCertificateOption.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\DelegatingHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\DiagnosticsHandlerLoggingStrings.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\FormUrlEncodedContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\AuthenticationHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\BaseHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ByteArrayHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\CacheControlHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\CacheControlHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ContentDispositionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ContentRangeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\DateHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\EntityTagHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\GenericHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HeaderDescriptor.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HeaderUtilities.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpContentHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpGeneralHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderType.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaderValueCollection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpRequestHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\HttpResponseHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\Int32NumberHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\Int64NumberHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\KnownHeader.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\KnownHeaders.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\MediaTypeWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\NameValueHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\NameValueWithParametersHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ObjectCollection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductInfoHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ProductInfoHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeConditionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RangeItemHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\RetryConditionHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\StringWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TimeSpanHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\TransferCodingWithQualityHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\UriHeaderParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\ViaHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\Headers\WarningHeaderValue.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpClient.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpClientHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpCompletionOption.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMessageHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMessageInvoker.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpMethod.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpParseResult.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRequestException.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRequestMessage.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpResponseMessage.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpRuleParser.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\HttpUtilities.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MessageProcessingHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MultipartContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\MultipartFormDataContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\ReadOnlyMemoryContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.Digest.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.NtAuth.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\CancellationHelper.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ChunkedEncodingReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ChunkedEncodingWriteStream.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ConnectHelper.cs" />
-        <Compile Include="HttpClientHandler.Legacy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ConnectionCloseReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ContentLengthReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\ContentLengthWriteStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\CookieHelper.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\DecompressionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\EmptyReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpAuthenticatedConnectionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnection.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionKind.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionPool.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionPoolManager.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionResponseContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpConnectionSettings.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentDuplexStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentReadStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpContentWriteStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\RawConnectionStream.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\RedirectHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\SocketsHttpHandler.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
+        <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
+        <Compile Include="HttpClientHandler.SocketsHandler.cs" />
         <Compile Include="HttpClientHandler.cs" />
+        <Compile Include="HttpRequestMessage.Mono.cs" />
         <Compile Include="IMonoHttpClientHandler.cs" />
         <Compile Include="MonoWebRequestHandler.cs" />
-        <Compile Include="PlatformHelper.Legacy.cs" />
-        <Compile Include="System.Net.Http.Headers\AuthenticationHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\CacheControlHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\CollectionExtensions.cs" />
-        <Compile Include="System.Net.Http.Headers\CollectionParser.cs" />
-        <Compile Include="System.Net.Http.Headers\ContentDispositionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ContentRangeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\EntityTagHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\HashCodeCalculator.cs" />
-        <Compile Include="System.Net.Http.Headers\HeaderInfo.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpContentHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaderKind.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaderValueCollection.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpRequestHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\HttpResponseHeaders.cs" />
-        <Compile Include="System.Net.Http.Headers\Lexer.cs" />
-        <Compile Include="System.Net.Http.Headers\MediaTypeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\MediaTypeWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\NameValueHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\NameValueWithParametersHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\Parser.cs" />
-        <Compile Include="System.Net.Http.Headers\ProductHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ProductInfoHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\QualityValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeConditionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RangeItemHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\RetryConditionHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\StringWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\TransferCodingHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\TransferCodingWithQualityHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\ViaHeaderValue.cs" />
-        <Compile Include="System.Net.Http.Headers\WarningHeaderValue.cs" />
-        <Compile Include="System.Net.Http\ByteArrayContent.cs" />
-        <Compile Include="System.Net.Http\ClientCertificateOption.cs" />
-        <Compile Include="System.Net.Http\DelegatingHandler.cs" />
-        <Compile Include="System.Net.Http\FormUrlEncodedContent.cs" />
-        <Compile Include="System.Net.Http\HttpClient.cs" />
+        <Compile Include="PlatformHelper.SocketsHandler.cs" />
         <Compile Include="System.Net.Http\HttpClient.macios.cs" />
-        <Compile Include="System.Net.Http\HttpCompletionOption.cs" />
-        <Compile Include="System.Net.Http\HttpContent.cs" />
-        <Compile Include="System.Net.Http\HttpMessageHandler.cs" />
-        <Compile Include="System.Net.Http\HttpMessageInvoker.cs" />
-        <Compile Include="System.Net.Http\HttpMethod.cs" />
-        <Compile Include="System.Net.Http\HttpRequestException.cs" />
-        <Compile Include="System.Net.Http\HttpRequestMessage.cs" />
-        <Compile Include="System.Net.Http\HttpResponseMessage.cs" />
-        <Compile Include="System.Net.Http\MessageProcessingHandler.cs" />
-        <Compile Include="System.Net.Http\MultipartContent.cs" />
-        <Compile Include="System.Net.Http\MultipartFormDataContent.cs" />
-        <Compile Include="System.Net.Http\StreamContent.cs" />
-        <Compile Include="System.Net.Http\StringContent.cs" />
-        <Compile Include="corefx\ReadOnlyMemoryContent.cs" />
+        <Compile Include="corefx\NetEventSource.Http.cs" />
+        <Compile Include="corefx\SocketsHttpHandler.Mono.cs" />
       </ItemGroup>
     </When>
     <When Condition="'$(Platform)' == 'monodroid'">
@@ -1178,7 +1328,6 @@
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamContent.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StreamToStreamCopy.cs" />
         <Compile Include="..\..\..\external\corefx\src\System.Net.Http\src\System\Net\Http\StringContent.cs" />
-        <Compile Include="..\corlib\System.Diagnostics\Debug.cs" />
         <Compile Include="HttpClientHandler.SocketsHandler.cs" />
         <Compile Include="HttpClientHandler.cs" />
         <Compile Include="HttpRequestMessage.Mono.cs" />