From 6c59f0e12410272c9f203aeacef12833a9e6f96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 9 Apr 2019 12:27:16 +0200 Subject: [PATCH] [System.Net.Http] Use LEGACY_HTTPCLIENT on xammac_net_4_5 It inherited the sockets http handler from net_4_x but for now we still want the legacy. --- mcs/build/profiles/xammac_net_4_5.make | 2 ++ .../System.Net.Http.WebRequest.csproj | 2 +- mcs/class/System.Net.Http/System.Net.Http.csproj | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mcs/build/profiles/xammac_net_4_5.make b/mcs/build/profiles/xammac_net_4_5.make index c88cbae4e15b..6c5c9efc7735 100644 --- a/mcs/build/profiles/xammac_net_4_5.make +++ b/mcs/build/profiles/xammac_net_4_5.make @@ -24,3 +24,5 @@ PROFILE_DISABLE_BTLS=1 MONO_FEATURE_APPLETLS=1 ONLY_APPLETLS=1 ENABLE_GSS=1 + +SOCKETSHTTPHANDLER= diff --git a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj index 45990a9e1cd4..1a2726cf229a 100644 --- a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj +++ b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj @@ -33,7 +33,7 @@ ./../../class/lib/xammac_net_4_5 ./../../class/obj/$(AssemblyName)-xammac_net_4_5 - NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN + NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN;LEGACY_HTTPCLIENT diff --git a/mcs/class/System.Net.Http/System.Net.Http.csproj b/mcs/class/System.Net.Http/System.Net.Http.csproj index 8c9cdd8f3915..68b26c402a25 100644 --- a/mcs/class/System.Net.Http/System.Net.Http.csproj +++ b/mcs/class/System.Net.Http/System.Net.Http.csproj @@ -79,7 +79,7 @@ ./../../class/lib/xammac_net_4_5 ./../../class/obj/$(AssemblyName)-xammac_net_4_5 - NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN;XAMARIN_MODERN + NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN;XAMARIN_MODERN;LEGACY_HTTPCLIENT ./../../class/lib/orbis