From b59da2a95fa20d3b3194ab77b02e2d9df7cf2bbc Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Thu, 4 Apr 2019 14:31:41 +1100 Subject: [PATCH 01/23] - Remove minimumSSLProtocol parameter - Set TLSMinimumSupportedProtocol based on ServicePointManager.SecurityProtocol on iOS --- .../iOS/NSUrlSessionHandler.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs b/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs index 610999d..2b406bd 100644 --- a/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs +++ b/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs @@ -54,20 +54,22 @@ public class NativeMessageHandler : HttpClientHandler public bool DisableCaching { get; set; } public NativeMessageHandler(): this(false, false) { } - public NativeMessageHandler(bool throwOnCaptiveNetwork, bool customSSLVerification, NativeCookieHandler cookieHandler = null, SslProtocol? minimumSSLProtocol = null) + public NativeMessageHandler(bool throwOnCaptiveNetwork, bool customSSLVerification, NativeCookieHandler cookieHandler = null) { var configuration = NSUrlSessionConfiguration.DefaultSessionConfiguration; // System.Net.ServicePointManager.SecurityProtocol provides a mechanism for specifying supported protocol types // for System.Net. Since iOS only provides an API for a minimum and maximum protocol we are not able to port // this configuration directly and instead use the specified minimum value when one is specified. - if (minimumSSLProtocol.HasValue) { - configuration.TLSMinimumSupportedProtocol = minimumSSLProtocol.Value; - } - - session = NSUrlSession.FromConfiguration( - NSUrlSessionConfiguration.DefaultSessionConfiguration, - new DataTaskDelegate(this), null); + var sp = ServicePointManager.SecurityProtocol; + if ((sp & SecurityProtocolType.Ssl3) != 0) + configuration.TLSMinimumSupportedProtocol = SslProtocol.Ssl_3_0; + else if ((sp & SecurityProtocolType.Tls) != 0) + configuration.TLSMinimumSupportedProtocol = SslProtocol.Tls_1_0; + else if ((sp & SecurityProtocolType.Tls11) != 0) + configuration.TLSMinimumSupportedProtocol = SslProtocol.Tls_1_1; + else if ((sp & SecurityProtocolType.Tls12) != 0) + configuration.TLSMinimumSupportedProtocol = SslProtocol.Tls_1_2; this.throwOnCaptiveNetwork = throwOnCaptiveNetwork; this.customSSLVerification = customSSLVerification; From 5117f17c8df5c3bfcd1bd7fbb1b152e23d59ef6f Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Thu, 4 Apr 2019 14:33:44 +1100 Subject: [PATCH 02/23] Update NSUrlSession.FromConfiguration with INSUrlSessionDelegate parameter, NSUrlSessionDelegate parameter is obsolete --- src/ModernHttpClient/iOS/NSUrlSessionHandler.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs b/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs index 2b406bd..4f2c950 100644 --- a/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs +++ b/src/ModernHttpClient/iOS/NSUrlSessionHandler.cs @@ -71,6 +71,9 @@ public NativeMessageHandler(bool throwOnCaptiveNetwork, bool customSSLVerificati else if ((sp & SecurityProtocolType.Tls12) != 0) configuration.TLSMinimumSupportedProtocol = SslProtocol.Tls_1_2; + INSUrlSessionDelegate sessionDelegate = new DataTaskDelegate (this); + session = NSUrlSession.FromConfiguration (NSUrlSessionConfiguration.DefaultSessionConfiguration, sessionDelegate, null); + this.throwOnCaptiveNetwork = throwOnCaptiveNetwork; this.customSSLVerification = customSSLVerification; From f0c3533c26fe4584b3853c7c92d1499d963fbb80 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Thu, 4 Apr 2019 14:42:22 +1100 Subject: [PATCH 03/23] Add resource.designer file to gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ffac3b9..fe8de75 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ build/ *.xam packages .vs +*Resource.designer.cs From fe644d757fe8cf1977a4f70b069a74ffe55528ce Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Thu, 4 Apr 2019 14:49:17 +1100 Subject: [PATCH 04/23] Update makefile to store nuget packages in ~/.local/share/NuGet/Cache/ folder --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f00056e..d8d33c6 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Po package: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll nuget pack - mv modernhttpclient*.nupkg ./build/ + mv modernhttpclient*.nupkg ~/.local/share/NuGet/Cache/ ModernHttpClient.Android.dll: $(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.Android.csproj From 6cc6250cd4c11fb25369f2d1a74996a0b3beee5f Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Thu, 4 Apr 2019 15:36:25 +1100 Subject: [PATCH 05/23] Version bump to 2.6.0 --- ModernHttpClient.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index fafc804..88e32df 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.5.1 + 2.6.0 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING From 32dac94bda9eebf69be22d0eaceee2b35b1c8ddb Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 10:27:34 +1100 Subject: [PATCH 06/23] Add version-bump and release-pack targets to makefile --- Makefile | 11 +++++++++++ ModernHttpClient.nuspec | 7 +++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d8d33c6..0f59036 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,12 @@ MDTOOL ?= /Applications/Visual\ Studio.app/Contents/MacOS/vstool +NUSPEC_FILE ?= ModernHttpClient.nuspec .PHONY: all clean all: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll +release-pack: version-bump package + package: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll nuget pack mv modernhttpclient*.nupkg ~/.local/share/NuGet/Cache/ @@ -27,3 +30,11 @@ clean: $(MDTOOL) build -t:Clean ModernHttpClient.sln rm *.dll rm -rf build + +version-bump: + $(eval version = $(shell grep '' $(NUSPEC_FILE) | sed "s@.*\(.*\).*@\1@")) + $(eval majorMinor = $(shell echo $(version) | rev | cut -d'.' -f2- | rev)) + $(eval buildNumber = $(shell echo $(version) | rev | cut -d'.' -f 1 | rev)) + $(eval newVersion = $(majorMinor).$(shell expr $(buildNumber) + 1)) + @echo version updated to $(newVersion) + $(shell xmlstarlet ed -L -N N="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd" -u '/N:package/N:metadata/N:version' -v $(newVersion) $(NUSPEC_FILE)) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 88e32df..507ee2c 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -11,15 +11,14 @@ false Write your app using System.Net.Http, but drop this library in and it will go drastically faster. Write your app using System.Net.Http, but drop this library in and it will go drastically faster. - Copyright Paul Betts © 2012 + Copyright Paul Betts © 2012 - + - - + From 652a4057565e2a8e0914696c78f8683590fbab7b Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 11:53:00 +1100 Subject: [PATCH 07/23] Remove version-bump targets in makefile --- Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Makefile b/Makefile index 0f59036..fbc7f1d 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,6 @@ NUSPEC_FILE ?= ModernHttpClient.nuspec all: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll -release-pack: version-bump package - package: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll nuget pack mv modernhttpclient*.nupkg ~/.local/share/NuGet/Cache/ @@ -30,11 +28,3 @@ clean: $(MDTOOL) build -t:Clean ModernHttpClient.sln rm *.dll rm -rf build - -version-bump: - $(eval version = $(shell grep '' $(NUSPEC_FILE) | sed "s@.*\(.*\).*@\1@")) - $(eval majorMinor = $(shell echo $(version) | rev | cut -d'.' -f2- | rev)) - $(eval buildNumber = $(shell echo $(version) | rev | cut -d'.' -f 1 | rev)) - $(eval newVersion = $(majorMinor).$(shell expr $(buildNumber) + 1)) - @echo version updated to $(newVersion) - $(shell xmlstarlet ed -L -N N="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd" -u '/N:package/N:metadata/N:version' -v $(newVersion) $(NUSPEC_FILE)) From d87700e305274b2443f81c3421b4aecacbdcc5b1 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 11:57:10 +1100 Subject: [PATCH 08/23] Revert whitespace changes in nuspec --- ModernHttpClient.nuspec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 507ee2c..4cb000d 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -11,14 +11,15 @@ false Write your app using System.Net.Http, but drop this library in and it will go drastically faster. Write your app using System.Net.Http, but drop this library in and it will go drastically faster. - Copyright Paul Betts © 2012 + Copyright Paul Betts © 2012 - + + - + From 531d8a4051fc6f6a86ba54da8557ec1a196c642e Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 12:05:43 +1100 Subject: [PATCH 09/23] Remove Resource.designer.cs file from repo --- .../Resources/Resource.designer.cs | 131 ------------------ 1 file changed, 131 deletions(-) delete mode 100644 src/Playground.Android/Resources/Resource.designer.cs diff --git a/src/Playground.Android/Resources/Resource.designer.cs b/src/Playground.Android/Resources/Resource.designer.cs deleted file mode 100644 index b947db6..0000000 --- a/src/Playground.Android/Resources/Resource.designer.cs +++ /dev/null @@ -1,131 +0,0 @@ -#pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ - -[assembly: Android.Runtime.ResourceDesignerAttribute("Playground.Android.Resource", IsApplication=true)] - -namespace Playground.Android -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - global::ModernHttpClient.Resource.String.library_name = global::Playground.Android.Resource.String.library_name; - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Drawable - { - - // aapt resource value: 0x7f020000 - public const int Icon = 2130837504; - - static Drawable() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Drawable() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f050001 - public const int cancelButton = 2131034113; - - // aapt resource value: 0x7f050000 - public const int doIt = 2131034112; - - // aapt resource value: 0x7f050004 - public const int md5sum = 2131034116; - - // aapt resource value: 0x7f050005 - public const int progress = 2131034117; - - // aapt resource value: 0x7f050003 - public const int result = 2131034115; - - // aapt resource value: 0x7f050002 - public const int status = 2131034114; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int Main = 2130903040; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f040002 - public const int app_name = 2130968578; - - // aapt resource value: 0x7f040001 - public const int hello = 2130968577; - - // aapt resource value: 0x7f040000 - public const int library_name = 2130968576; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 From d9f61ebb9b70f176c40e92a70df45af3b8adc289 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 12:11:20 +1100 Subject: [PATCH 10/23] Remove whitespace --- ModernHttpClient.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 4cb000d..88e32df 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -18,7 +18,7 @@ - + From 2dbe73e891b76d5c1f2697f86e397f34a1c57818 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 12:11:57 +1100 Subject: [PATCH 11/23] Remove NUSPEC_FILE variable --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index fbc7f1d..d8d33c6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ MDTOOL ?= /Applications/Visual\ Studio.app/Contents/MacOS/vstool -NUSPEC_FILE ?= ModernHttpClient.nuspec .PHONY: all clean From 78b4adcae8c6fe2a795f4945ab80ea7f64b38be1 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Fri, 5 Apr 2019 12:14:21 +1100 Subject: [PATCH 12/23] Revert changes to makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d8d33c6..f00056e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Po package: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll nuget pack - mv modernhttpclient*.nupkg ~/.local/share/NuGet/Cache/ + mv modernhttpclient*.nupkg ./build/ ModernHttpClient.Android.dll: $(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.Android.csproj From 49522d03d425ea72074cf60d44ec6900d94bb579 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Wed, 1 May 2019 16:32:05 +1000 Subject: [PATCH 13/23] Upgrade okhttp library to v3 --- ModernHttpClient.nuspec | 2 +- README.md | 2 +- .../Android/OkHttpNetworkHandler.cs | 45 ++++--------------- .../ModernHttpClient.Android.csproj | 6 +-- src/ModernHttpClient/packages.config | 8 ++-- .../Playground.Android.csproj | 6 +-- src/Playground.Android/packages.config | 8 ++-- 7 files changed, 24 insertions(+), 53 deletions(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 88e32df..931641c 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -14,7 +14,7 @@ Copyright Paul Betts © 2012 - + diff --git a/README.md b/README.md index d7da13a..570b6f0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ System.Net.Http, but drop this library in and it will go drastically faster. This is made possible by two native libraries: * On iOS, [NSURLSession](https://developer.apple.com/library/ios/documentation/Foundation/Reference/NSURLSession_class/Introduction/Introduction.html) -* On Android, via [OkHttp](http://square.github.io/okhttp/) +* On Android, via [OkHttp v3](http://square.github.io/okhttp/) ## Usage diff --git a/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs b/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs index 3edbd65..f7c59d7 100644 --- a/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs +++ b/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Net; using System.Net.Http; -using Square.OkHttp; +using Square.OkHttp3; using Javax.Net.Ssl; using System.Text.RegularExpressions; using Java.IO; @@ -36,7 +36,10 @@ public NativeMessageHandler(bool throwOnCaptiveNetwork, bool customSSLVerificati { this.throwOnCaptiveNetwork = throwOnCaptiveNetwork; - if (customSSLVerification) client.SetHostnameVerifier(new HostnameVerifier()); + var clientBuilder = new OkHttpClient.Builder (); + if (customSSLVerification) clientBuilder.HostnameVerifier(new HostnameVerifier()); + client = clientBuilder.Build (); + noCacheCacheControl = (new CacheControl.Builder()).NoCache().Build(); } @@ -118,12 +121,12 @@ protected override async Task SendAsync(HttpRequestMessage var resp = default(Response); try { - resp = await call.EnqueueAsync().ConfigureAwait(false); + resp = await call.ExecuteAsync().ConfigureAwait(false); var newReq = resp.Request(); - var newUri = newReq == null ? null : newReq.Uri(); + var newUri = newReq == null ? null : newReq.Url(); request.RequestUri = new Uri(newUri.ToString()); if (throwOnCaptiveNetwork && newUri != null) { - if (url.Host != newUri.Host) { + if (url.Host != newUri.Host()) { throw new CaptiveNetworkException(new Uri(java_uri), new Uri(newUri.ToString())); } } @@ -160,38 +163,6 @@ protected override async Task SendAsync(HttpRequestMessage } } - public static class AwaitableOkHttp - { - public static Task EnqueueAsync(this Call This) - { - var cb = new OkTaskCallback(); - This.Enqueue(cb); - - return cb.Task; - } - - class OkTaskCallback : Java.Lang.Object, ICallback - { - readonly TaskCompletionSource tcs = new TaskCompletionSource(); - public Task Task { get { return tcs.Task; } } - - public void OnFailure(Request p0, Java.IO.IOException p1) - { - // Kind of a hack, but the simplest way to find out that server cert. validation failed - if (p1.Message == String.Format("Hostname '{0}' was not verified", p0.Url().Host)) { - tcs.TrySetException(new WebException(p1.LocalizedMessage, WebExceptionStatus.TrustFailure)); - } else { - tcs.TrySetException(p1); - } - } - - public void OnResponse(Response p0) - { - tcs.TrySetResult(p0); - } - } - } - class HostnameVerifier : Java.Lang.Object, IHostnameVerifier { static readonly Regex cnRegex = new Regex(@"CN\s*=\s*([^,]*)", RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.Singleline); diff --git a/src/ModernHttpClient/ModernHttpClient.Android.csproj b/src/ModernHttpClient/ModernHttpClient.Android.csproj index 91110e4..ff4d16c 100644 --- a/src/ModernHttpClient/ModernHttpClient.Android.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Android.csproj @@ -57,11 +57,11 @@ - ..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll + ..\..\packages\Square.OkIO.1.13.0\lib\MonoAndroid\Square.OkIO.dll - - ..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll + + ..\..\packages\Square.OkHttp3.3.8.1\lib\MonoAndroid\Square.OkHttp3.dll diff --git a/src/ModernHttpClient/packages.config b/src/ModernHttpClient/packages.config index 683dfae..1182cb6 100644 --- a/src/ModernHttpClient/packages.config +++ b/src/ModernHttpClient/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Playground.Android/Playground.Android.csproj b/src/Playground.Android/Playground.Android.csproj index b1712e9..8123837 100644 --- a/src/Playground.Android/Playground.Android.csproj +++ b/src/Playground.Android/Playground.Android.csproj @@ -55,10 +55,10 @@ - ..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll + ..\..\packages\Square.OkIO.1.13.0\lib\MonoAndroid\Square.OkIO.dll - - ..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll + + ..\..\packages\Square.OkHttp3.3.8.1\lib\MonoAndroid\Square.OkHttp3.dll diff --git a/src/Playground.Android/packages.config b/src/Playground.Android/packages.config index 5125da1..1182cb6 100644 --- a/src/Playground.Android/packages.config +++ b/src/Playground.Android/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file From f9da6f5f2f703178fa88f2bc1732d37e9eeae9bf Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Wed, 1 May 2019 16:32:41 +1000 Subject: [PATCH 14/23] Version bump to 2.6.2 --- ModernHttpClient.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 931641c..919112c 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.6.0 + 2.6.2 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING From 4a29dbd35e35574d7b08758d062087f1b83cd68f Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Tue, 4 Jun 2019 10:30:46 +1000 Subject: [PATCH 15/23] - Update ModernHttpClient.Portable project to netstandard 2 - Change ModernHttpClient.Android targetFrameworkVersion to v8.1 - Update Make file to build ModernHttpClient.Portable project with .net core cli --- Makefile | 8 ++-- ModernHttpClient.sln | 2 +- .../ModernHttpClient.Android.csproj | 2 +- .../ModernHttpClient.Portable.csproj | 48 ------------------- .../{ => Portable}/Facades.cs | 0 .../Portable/ModernHttpClient.Portable.csproj | 14 ++++++ 6 files changed, 20 insertions(+), 54 deletions(-) delete mode 100644 src/ModernHttpClient/ModernHttpClient.Portable.csproj rename src/ModernHttpClient/{ => Portable}/Facades.cs (100%) create mode 100644 src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj diff --git a/Makefile b/Makefile index f00056e..afcf573 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,11 @@ ModernHttpClient.iOS64.dll: mv ./src/ModernHttpClient/bin/Release/Xamarin.iOS10/Modern* ./build/Xamarin.iOS10 ModernHttpClient.Portable.dll: - $(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.Portable.csproj - mkdir -p ./build/Portable-Net45+WinRT45+WP8+WPA81 - mv ./src/ModernHttpClient/bin/Release/Portable-Net45+WinRT45+WP8+WPA81/Modern* ./build/Portable-Net45+WinRT45+WP8+WPA81 + dotnet build ./src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj -c:Release + mkdir -p ./build/netstandard2.0 + mv ./src/ModernHttpClient/Portable/bin/Release/netstandard2.0/Modern* ./build/netstandard2.0 clean: $(MDTOOL) build -t:Clean ModernHttpClient.sln - rm *.dll + dotnet clean ./src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj rm -rf build diff --git a/ModernHttpClient.sln b/ModernHttpClient.sln index 7c3f91f..3787195 100644 --- a/ModernHttpClient.sln +++ b/ModernHttpClient.sln @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.Android", "src\P EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.iOS", "src\Playground.iOS\Playground.iOS.csproj", "{2CE837CD-9B97-4058-9156-339697EEE228}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Portable", "src\ModernHttpClient\ModernHttpClient.Portable.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Portable", "src\ModernHttpClient\Portable\ModernHttpClient.Portable.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS64", "src\ModernHttpClient\ModernHttpClient.iOS64.csproj", "{6941F069-AC02-40EE-BBF3-9FE3331030EF}" EndProject diff --git a/src/ModernHttpClient/ModernHttpClient.Android.csproj b/src/ModernHttpClient/ModernHttpClient.Android.csproj index 91110e4..736385e 100644 --- a/src/ModernHttpClient/ModernHttpClient.Android.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Android.csproj @@ -14,7 +14,7 @@ Resources Assets ModernHttpClient - v4.4 + v8.1 true diff --git a/src/ModernHttpClient/ModernHttpClient.Portable.csproj b/src/ModernHttpClient/ModernHttpClient.Portable.csproj deleted file mode 100644 index 791c717..0000000 --- a/src/ModernHttpClient/ModernHttpClient.Portable.csproj +++ /dev/null @@ -1,48 +0,0 @@ - - - - Debug - AnyCPU - {6DD98593-4498-463D-B16E-F6CC5A928B79} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - ModernHttpClient.Portable - ModernHttpClient - Profile78 - v4.5 - 8.0.30703 - 2.0 - - - true - full - false - bin\Debug\Portable-Net45+WinRT45+WP8+WPA81 - obj\Debug\Portable-Net45+WinRT45+WP8+WPA81 - DEBUG; - prompt - 4 - false - - - full - true - bin\Release\Portable-Net45+WinRT45+WP8+WPA81 - obj\Release\Portable-Net45+WinRT45+WP8+WPA81 - prompt - 4 - false - - - - - - - - - - ..\..\ext\portable-headers\System.Net.Http.dll - false - - - diff --git a/src/ModernHttpClient/Facades.cs b/src/ModernHttpClient/Portable/Facades.cs similarity index 100% rename from src/ModernHttpClient/Facades.cs rename to src/ModernHttpClient/Portable/Facades.cs diff --git a/src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj b/src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj new file mode 100644 index 0000000..dd958dd --- /dev/null +++ b/src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj @@ -0,0 +1,14 @@ + + + + netstandard2.0 + + + + + + + CaptiveNetworkException.cs + + + From b93502cb5ea0a8e022ea2298d19d790563215ff0 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Tue, 4 Jun 2019 10:38:35 +1000 Subject: [PATCH 16/23] Version bump to 2.5.2 --- ModernHttpClient.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index fafc804..461ce0c 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.5.1 + 2.5.2 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING From 3bf6a9403345bfed887ed3780ba4795b7d23d79f Mon Sep 17 00:00:00 2001 From: Thanh-Dat Nguyen Date: Tue, 11 Jun 2019 11:53:10 +1000 Subject: [PATCH 17/23] Update script and change remove .Portable name --- Makefile | 10 +++++----- ModernHttpClient.nuspec | 2 +- ModernHttpClient.sln | 2 +- ...pClient.Portable.csproj => ModernHttpClient.csproj} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename src/ModernHttpClient/Portable/{ModernHttpClient.Portable.csproj => ModernHttpClient.csproj} (100%) diff --git a/Makefile b/Makefile index afcf573..4d19f8d 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ MDTOOL ?= /Applications/Visual\ Studio.app/Contents/MacOS/vstool .PHONY: all clean -all: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll +all: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.dll -package: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll +package: ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.dll nuget pack mv modernhttpclient*.nupkg ./build/ @@ -18,10 +18,10 @@ ModernHttpClient.iOS64.dll: mkdir -p ./build/Xamarin.iOS10 mv ./src/ModernHttpClient/bin/Release/Xamarin.iOS10/Modern* ./build/Xamarin.iOS10 -ModernHttpClient.Portable.dll: - dotnet build ./src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj -c:Release +ModernHttpClient.dll: + dotnet build ./src/ModernHttpClient/Portable/ModernHttpClient.csproj -c:Release mkdir -p ./build/netstandard2.0 - mv ./src/ModernHttpClient/Portable/bin/Release/netstandard2.0/Modern* ./build/netstandard2.0 + mv ./src/ModernHttpClient/bin/Release/netstandard2.0/Modern* ./build/netstandard2.0 clean: $(MDTOOL) build -t:Clean ModernHttpClient.sln diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 461ce0c..c47bc53 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.5.2 + 2.5.4 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING diff --git a/ModernHttpClient.sln b/ModernHttpClient.sln index 3787195..19a7d52 100644 --- a/ModernHttpClient.sln +++ b/ModernHttpClient.sln @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.Android", "src\P EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.iOS", "src\Playground.iOS\Playground.iOS.csproj", "{2CE837CD-9B97-4058-9156-339697EEE228}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Portable", "src\ModernHttpClient\Portable\ModernHttpClient.Portable.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient", "src\ModernHttpClient\Portable\ModernHttpClient.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS64", "src\ModernHttpClient\ModernHttpClient.iOS64.csproj", "{6941F069-AC02-40EE-BBF3-9FE3331030EF}" EndProject diff --git a/src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj b/src/ModernHttpClient/Portable/ModernHttpClient.csproj similarity index 100% rename from src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj rename to src/ModernHttpClient/Portable/ModernHttpClient.csproj From 35fef542c68067c12ba169342e967e19f022f9dc Mon Sep 17 00:00:00 2001 From: Thanh-Dat Nguyen Date: Tue, 11 Jun 2019 13:07:05 +1000 Subject: [PATCH 18/23] Verion Bump to 2.5.5 Rename folder Portable to NetStandard --- Makefile | 4 ++-- ModernHttpClient.nuspec | 2 +- ModernHttpClient.sln | 2 +- src/ModernHttpClient/{Portable => NetStandard}/Facades.cs | 0 .../{Portable => NetStandard}/ModernHttpClient.csproj | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-) rename src/ModernHttpClient/{Portable => NetStandard}/Facades.cs (100%) rename src/ModernHttpClient/{Portable => NetStandard}/ModernHttpClient.csproj (58%) diff --git a/Makefile b/Makefile index 4d19f8d..6c99ea0 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,11 @@ ModernHttpClient.iOS64.dll: mv ./src/ModernHttpClient/bin/Release/Xamarin.iOS10/Modern* ./build/Xamarin.iOS10 ModernHttpClient.dll: - dotnet build ./src/ModernHttpClient/Portable/ModernHttpClient.csproj -c:Release + dotnet build ./src/ModernHttpClient/NetStandard/ModernHttpClient.csproj -c:Release mkdir -p ./build/netstandard2.0 mv ./src/ModernHttpClient/bin/Release/netstandard2.0/Modern* ./build/netstandard2.0 clean: $(MDTOOL) build -t:Clean ModernHttpClient.sln - dotnet clean ./src/ModernHttpClient/Portable/ModernHttpClient.Portable.csproj + dotnet clean ./src/ModernHttpClient/NetStandard/ModernHttpClient.csproj rm -rf build diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index c47bc53..f11f50f 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.5.4 + 2.5.5 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING diff --git a/ModernHttpClient.sln b/ModernHttpClient.sln index 19a7d52..7a3744a 100644 --- a/ModernHttpClient.sln +++ b/ModernHttpClient.sln @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.Android", "src\P EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.iOS", "src\Playground.iOS\Playground.iOS.csproj", "{2CE837CD-9B97-4058-9156-339697EEE228}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient", "src\ModernHttpClient\Portable\ModernHttpClient.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient", "src\ModernHttpClient\NetStandard\ModernHttpClient.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS64", "src\ModernHttpClient\ModernHttpClient.iOS64.csproj", "{6941F069-AC02-40EE-BBF3-9FE3331030EF}" EndProject diff --git a/src/ModernHttpClient/Portable/Facades.cs b/src/ModernHttpClient/NetStandard/Facades.cs similarity index 100% rename from src/ModernHttpClient/Portable/Facades.cs rename to src/ModernHttpClient/NetStandard/Facades.cs diff --git a/src/ModernHttpClient/Portable/ModernHttpClient.csproj b/src/ModernHttpClient/NetStandard/ModernHttpClient.csproj similarity index 58% rename from src/ModernHttpClient/Portable/ModernHttpClient.csproj rename to src/ModernHttpClient/NetStandard/ModernHttpClient.csproj index dd958dd..87d8bc7 100644 --- a/src/ModernHttpClient/Portable/ModernHttpClient.csproj +++ b/src/ModernHttpClient/NetStandard/ModernHttpClient.csproj @@ -3,6 +3,12 @@ netstandard2.0 + + ..\bin\Debug\ + + + ..\bin\Release\ + From 989294c1e3c98c2e56765f1bd0b02ed68da139dd Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Mon, 6 Jul 2020 10:45:17 +1000 Subject: [PATCH 19/23] bump okhttp3 to 3.14.9 --- ModernHttpClient.nuspec | 4 ++-- src/ModernHttpClient/ModernHttpClient.Android.csproj | 9 +++++---- src/ModernHttpClient/packages.config | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index 919112c..e58aa28 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.6.2 + 2.6.4 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING @@ -14,7 +14,7 @@ Copyright Paul Betts © 2012 - + diff --git a/src/ModernHttpClient/ModernHttpClient.Android.csproj b/src/ModernHttpClient/ModernHttpClient.Android.csproj index 200ba21..8dca6cd 100644 --- a/src/ModernHttpClient/ModernHttpClient.Android.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Android.csproj @@ -14,7 +14,7 @@ Resources Assets ModernHttpClient - v8.1 + v10.0 true @@ -57,12 +57,13 @@ - ..\..\packages\Square.OkIO.1.13.0\lib\MonoAndroid\Square.OkIO.dll + ..\..\packages\Square.OkIO.1.17.4\lib\monoandroid44\Square.OkIO.dll - - ..\..\packages\Square.OkHttp3.3.8.1\lib\MonoAndroid\Square.OkHttp3.dll + ..\..\packages\Square.OkHttp3.3.14.9\lib\monoandroid44\Square.OkHttp3.dll + + diff --git a/src/ModernHttpClient/packages.config b/src/ModernHttpClient/packages.config index 1182cb6..13d9885 100644 --- a/src/ModernHttpClient/packages.config +++ b/src/ModernHttpClient/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file From 6844ef109fd56d84a93a90c0823625c4f2238301 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Mon, 6 Jul 2020 10:46:27 +1000 Subject: [PATCH 20/23] remove Resources.designer.cs file in repo --- .../Resources/Resource.designer.cs | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 src/ModernHttpClient/Resources/Resource.designer.cs diff --git a/src/ModernHttpClient/Resources/Resource.designer.cs b/src/ModernHttpClient/Resources/Resource.designer.cs deleted file mode 100644 index 861eaa2..0000000 --- a/src/ModernHttpClient/Resources/Resource.designer.cs +++ /dev/null @@ -1,57 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("ModernHttpClient.Resource", IsApplication=false)] - -namespace ModernHttpClient -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f020000 - public static int library_name = 2130837504; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 From 561bf7590ac777ace1630f42053db24715fa955f Mon Sep 17 00:00:00 2001 From: Thanh-Dat Nguyen Date: Thu, 16 Jul 2020 17:20:41 +1000 Subject: [PATCH 21/23] update OKHttp3 to version 4.2.2 --- .../ModernHttpClient.Android.csproj | 20 +++++++++++++++---- src/ModernHttpClient/packages.config | 7 +++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/ModernHttpClient/ModernHttpClient.Android.csproj b/src/ModernHttpClient/ModernHttpClient.Android.csproj index 8dca6cd..78dfaef 100644 --- a/src/ModernHttpClient/ModernHttpClient.Android.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Android.csproj @@ -56,14 +56,26 @@ + + + + ..\..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\lib\monoandroid90\Xamarin.Jetbrains.Annotations.dll + + + ..\..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\lib\monoandroid90\Xamarin.Kotlin.StdLib.Common.dll + + + ..\..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\lib\monoandroid90\Xamarin.Kotlin.StdLib.dll + - ..\..\packages\Square.OkIO.1.17.4\lib\monoandroid44\Square.OkIO.dll + ..\..\packages\Square.OkIO.2.2.2\lib\monoandroid90\Square.OkIO.dll - ..\..\packages\Square.OkHttp3.3.14.9\lib\monoandroid44\Square.OkHttp3.dll + ..\..\packages\Square.OkHttp3.4.2.2\lib\monoandroid90\Square.OkHttp3.dll - - + + + diff --git a/src/ModernHttpClient/packages.config b/src/ModernHttpClient/packages.config index 13d9885..e231900 100644 --- a/src/ModernHttpClient/packages.config +++ b/src/ModernHttpClient/packages.config @@ -1,5 +1,8 @@  - - + + + + + \ No newline at end of file From 591dc54a99349e82951639b6e4e14abfb428da24 Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Mon, 20 Jul 2020 15:56:01 +1000 Subject: [PATCH 22/23] Update Playground.Android project to okhttp3 version 4.2.2 --- src/Playground.Android/MainActivity.cs | 4 ++-- .../Playground.Android.csproj | 19 ++++++++++++++++--- .../Properties/AndroidManifest.xml | 2 +- src/Playground.Android/packages.config | 7 +++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/Playground.Android/MainActivity.cs b/src/Playground.Android/MainActivity.cs index 94a4b83..6d0337e 100644 --- a/src/Playground.Android/MainActivity.cs +++ b/src/Playground.Android/MainActivity.cs @@ -52,8 +52,8 @@ protected override void OnCreate (Bundle bundle) //This API is only available in Mono and Xamarin products. //You can filter and/or re-order the ciphers suites that the SSL/TLS server will accept from a client. //The following example removes weak (export) ciphers from the list that will be offered to the server. - ServicePointManager.ClientCipherSuitesCallback += (protocol, allCiphers) => - allCiphers.Where(x => !x.Contains("EXPORT")).ToList(); + //ServicePointManager.ClientCipherSuitesCallback += (protocol, allCiphers) => + // allCiphers.Where(x => !x.Contains("EXPORT")).ToList(); //Here we accept any certificate and just print the cert's data. ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => { diff --git a/src/Playground.Android/Playground.Android.csproj b/src/Playground.Android/Playground.Android.csproj index 8123837..0b50a60 100644 --- a/src/Playground.Android/Playground.Android.csproj +++ b/src/Playground.Android/Playground.Android.csproj @@ -15,7 +15,7 @@ Resources Assets Playground.Android - v4.4 + v10.0 Properties\AndroidManifest.xml @@ -55,10 +55,20 @@ - ..\..\packages\Square.OkIO.1.13.0\lib\MonoAndroid\Square.OkIO.dll + ..\..\packages\Square.OkIO.2.2.2\lib\monoandroid90\Square.OkIO.dll - ..\..\packages\Square.OkHttp3.3.8.1\lib\MonoAndroid\Square.OkHttp3.dll + ..\..\packages\Square.OkHttp3.4.2.2\lib\monoandroid90\Square.OkHttp3.dll + + + ..\..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\lib\monoandroid90\Xamarin.Jetbrains.Annotations.dll + + + + ..\..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\lib\monoandroid90\Xamarin.Kotlin.StdLib.Common.dll + + + ..\..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\lib\monoandroid90\Xamarin.Kotlin.StdLib.dll @@ -84,4 +94,7 @@ ModernHttpClient.Android + + + diff --git a/src/Playground.Android/Properties/AndroidManifest.xml b/src/Playground.Android/Properties/AndroidManifest.xml index 3df56b0..ce5f0b4 100644 --- a/src/Playground.Android/Properties/AndroidManifest.xml +++ b/src/Playground.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/Playground.Android/packages.config b/src/Playground.Android/packages.config index 1182cb6..e231900 100644 --- a/src/Playground.Android/packages.config +++ b/src/Playground.Android/packages.config @@ -1,5 +1,8 @@  - - + + + + + \ No newline at end of file From 2f4e7fd2be3019187d3011d17b6a3da17fb5753b Mon Sep 17 00:00:00 2001 From: Dorothy Tam Date: Mon, 20 Jul 2020 15:56:24 +1000 Subject: [PATCH 23/23] Version bump to 2.6.5 --- ModernHttpClient.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModernHttpClient.nuspec b/ModernHttpClient.nuspec index e58aa28..9fd3f69 100644 --- a/ModernHttpClient.nuspec +++ b/ModernHttpClient.nuspec @@ -1,7 +1,7 @@ - 2.6.4 + 2.6.5 Switch Media, Paul Betts Switch Media, Paul Betts https://github.com/paulcbetts/ModernHttpClient/blob/master/COPYING @@ -14,7 +14,7 @@ Copyright Paul Betts © 2012 - +