From bf587d876d67b112aa5d2e32b9aaf9eac6ad215e Mon Sep 17 00:00:00 2001
From: "Zach Keeping [SSW]" <11418832+zacharykeeping@users.noreply.github.com>
Date: Tue, 15 Oct 2024 09:45:52 +1100
Subject: [PATCH] Remove rollback and native HTTP handler for Android (#1081)

---
 .github/workflows/android-build.yml | 4 ++--
 rollback.json                       | 3 ---
 src/MobileUI/MobileUI.csproj        | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 rollback.json

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 9d519de0..82473f56 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -45,8 +45,8 @@ jobs:
       - name: Install MAUI Workload
         run: |
           dotnet nuget locals all --clear
-          dotnet workload install maui --ignore-failed-sources --from-rollback-file rollback.json
-          dotnet workload install android maui wasm-tools --source https://api.nuget.org/v3/index.json --from-rollback-file rollback.json
+          dotnet workload install maui --ignore-failed-sources
+          dotnet workload install android maui wasm-tools --source https://api.nuget.org/v3/index.json
 
       - name: Restore Dependencies
         run: |
diff --git a/rollback.json b/rollback.json
deleted file mode 100644
index f7ce8165..00000000
--- a/rollback.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "microsoft.net.sdk.android": "34.0.95/8.0.100"
-}
diff --git a/src/MobileUI/MobileUI.csproj b/src/MobileUI/MobileUI.csproj
index bff04e5c..605d34a7 100644
--- a/src/MobileUI/MobileUI.csproj
+++ b/src/MobileUI/MobileUI.csproj
@@ -22,6 +22,9 @@
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+
+        <!-- Workaround for HttpClient disposed crashes on Android -->
+        <UseNativeHttpHandler Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">false</UseNativeHttpHandler>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">