Enable test and fix .net 7+

xamarin · Oct 17, 2022 · 30264af · 30264af
1 parent d5a3e77
commit 30264af
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -95,6 +95,7 @@
     <HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
     <InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
     <StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
+    <UseNativeHttpHandler Condition=" $(AndroidHttpClientHandlerType.Contains ('System.Net.Http.SocketsHttpHandler')) And '$(UseNativeHttpHandler)' == '' ">false</UseNativeHttpHandler>
     <UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>
     <_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true</_AggressiveAttributeTrimming>
     <NullabilityInfoContextSupport Condition="'$(NullabilityInfoContextSupport)' == ''">false</NullabilityInfoContextSupport>

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -170,13 +170,19 @@ private void PreserveCustomHttpClientHandler (string handlerType, string handler
 		}
 
 		[Test]
-		[Category ("DotNetIgnore")] // HttpClientHandler options not implemented in .NET 5+ yet
 		public void PreserveCustomHttpClientHandlers ()
 		{
-			PreserveCustomHttpClientHandler ("Xamarin.Android.Net.AndroidClientHandler", "",
-				"temp/PreserveAndroidHttpClientHandler", "android/assets/Mono.Android.dll");
-			PreserveCustomHttpClientHandler ("System.Net.Http.MonoWebRequestHandler", "System.Net.Http",
-				"temp/PreserveMonoWebRequestHandler", "android/assets/System.Net.Http.dll");
+			if (Builder.UseDotNet) {
+				PreserveCustomHttpClientHandler ("Xamarin.Android.Net.AndroidMessageHandler", "",
+					"temp/PreserveAndroidMessageHandler", "android-arm64/linked/Mono.Android.dll");
+				PreserveCustomHttpClientHandler ("System.Net.Http.SocketsHttpHandler", "System.Net.Http",
+					"temp/PreserveSocketsHttpHandler", "android-arm64/linked/System.Net.Http.dll");
+			} else {
+				PreserveCustomHttpClientHandler ("Xamarin.Android.Net.AndroidClientHandler", "",
+					"temp/PreserveAndroidHttpClientHandler", "android/assets/Mono.Android.dll");
+				PreserveCustomHttpClientHandler ("System.Net.Http.MonoWebRequestHandler", "System.Net.Http",
+					"temp/PreserveMonoWebRequestHandler", "android/assets/System.Net.Http.dll");
+			}
 		}
 
 		[Test]