From 6cfc8b5a60516d25bd032361224a09e1f8ba0f12 Mon Sep 17 00:00:00 2001
From: Vincent Dondain <vidondai@microsoft.com>
Date: Wed, 29 Aug 2018 15:16:19 -0400
Subject: [PATCH] [msbuild] Change MtouchHttpClientHandler default (#4172)

If the Http Client value isn't set in the csproj, we should default to `NSUrlSessionHandler` which is also what the Xamarin.iOS Analysis rules try to enforce.
---
 msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props | 2 +-
 tests/mtouch/MTouch.cs                                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
index 5137f3a5e6..de1f2acdf1 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
@@ -40,7 +40,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<MtouchDebug Condition="'$(MtouchDebug)' == ''">False</MtouchDebug>
 		<MtouchEnableGenericValueTypeSharing Condition="'$(MtouchEnableGenericValueTypeSharing)' == ''">True</MtouchEnableGenericValueTypeSharing>
 		<MtouchFastDev Condition="'$(MtouchFastDev)' == ''">False</MtouchFastDev>
-		<MtouchHttpClientHandler Condition="'$(MtouchHttpClientHandler)' == ''">HttpClientHandler</MtouchHttpClientHandler>
+		<MtouchHttpClientHandler Condition="'$(MtouchHttpClientHandler)' == ''">NSUrlSessionHandler</MtouchHttpClientHandler>
 		<MtouchProfiling Condition="'$(MtouchProfiling)' == ''">False</MtouchProfiling>
 		<MtouchLinkerDumpDependencies Condition="'$(MtouchLinkerDumpDependencies)' == ''">False</MtouchLinkerDumpDependencies>
 		<MtouchLink Condition="'$(MtouchLink)' == ''">SdkOnly</MtouchLink>
diff --git a/tests/mtouch/MTouch.cs b/tests/mtouch/MTouch.cs
index 17ede9bf04..be94cef9c8 100644
--- a/tests/mtouch/MTouch.cs
+++ b/tests/mtouch/MTouch.cs
@@ -3673,8 +3673,8 @@ public class TestApp {
 		[TestCase ("CFNetworkHandler", "CFNetworkHandler")]
 		[TestCase ("NSUrlSessionHandler", "NSUrlSessionHandler")]
 		[TestCase ("HttpClientHandler", "HttpClientHandler")]
-		[TestCase (null, "HttpClientHandler")]
-		[TestCase ("", "HttpClientHandler")]
+		[TestCase (null, "NSUrlSessionHandler")]
+		[TestCase ("", "NSUrlSessionHandler")]
 		public void HttpClientHandler (string mtouchHandler, string expectedHandler)
 		{
 			var testCode = $@"