Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <mabaul@microsoft.com>2019-03-07 03:45:43 +0300
committerMarek Safar <marek.safar@gmail.com>2019-03-07 20:47:03 +0300
commit2d6f02a83c5715b41364fe450f3bf4391c64c37b (patch)
tree9a26026b45aaf0b8d8cd30cf33b9863523152f9f /mcs/class/System.Net.Http
parentdeebdd1489fd39f33d405f1bf1eeed00e5f0493c (diff)
HttpClient for Android.
Diffstat (limited to 'mcs/class/System.Net.Http')
-rw-r--r--mcs/class/System.Net.Http/FunctionalTests/monodroid_System.Net.Http.FunctionalTests_xtest.dll.sources1
-rw-r--r--mcs/class/System.Net.Http/System.Net.Http/HttpClient.android.cs7
-rw-r--r--mcs/class/System.Net.Http/UnitTests/monodroid_System.Net.Http.UnitTests_xtest.dll.sources1
-rw-r--r--mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.exclude.sources1
-rw-r--r--mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.sources2
5 files changed, 5 insertions, 7 deletions
diff --git a/mcs/class/System.Net.Http/FunctionalTests/monodroid_System.Net.Http.FunctionalTests_xtest.dll.sources b/mcs/class/System.Net.Http/FunctionalTests/monodroid_System.Net.Http.FunctionalTests_xtest.dll.sources
new file mode 100644
index 00000000000..fdec50375fd
--- /dev/null
+++ b/mcs/class/System.Net.Http/FunctionalTests/monodroid_System.Net.Http.FunctionalTests_xtest.dll.sources
@@ -0,0 +1 @@
+#include functional-tests.sources
diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.android.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.android.cs
index be3b46db0c5..1ef1af81b77 100644
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.android.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.android.cs
@@ -6,12 +6,7 @@ using System.Threading.Tasks;
namespace System.Net.Http {
public partial class HttpClient {
- public HttpClient ()
- : this (GetDefaultHandler (), true)
- {
- }
-
- static HttpMessageHandler GetDefaultHandler ()
+ static HttpMessageHandler CreateDefaultHandler ()
{
Type type = Type.GetType("Android.Runtime.AndroidEnvironment, Mono.Android");
if (type == null)
diff --git a/mcs/class/System.Net.Http/UnitTests/monodroid_System.Net.Http.UnitTests_xtest.dll.sources b/mcs/class/System.Net.Http/UnitTests/monodroid_System.Net.Http.UnitTests_xtest.dll.sources
new file mode 100644
index 00000000000..ea8b52eca73
--- /dev/null
+++ b/mcs/class/System.Net.Http/UnitTests/monodroid_System.Net.Http.UnitTests_xtest.dll.sources
@@ -0,0 +1 @@
+#include unit-tests.sources
diff --git a/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.exclude.sources b/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.exclude.sources
new file mode 100644
index 00000000000..c1788b13bf2
--- /dev/null
+++ b/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.exclude.sources
@@ -0,0 +1 @@
+HttpClient.DefaultHandler.cs
diff --git a/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.sources b/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.sources
index f5149e8e161..eca4fd33a42 100644
--- a/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.sources
+++ b/mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.sources
@@ -1,2 +1,2 @@
-#include legacy.sources
+#include socketshandler.sources
System.Net.Http/HttpClient.android.cs