fix: Remove support for android workload arm64 linux

The scenario is not supported by .NET.
unoplatform · Nov 28, 2023 · 3ee5015 · 3ee5015
1 parent 376ef42
commit 3ee5015
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/UnoCheck/Checkups/DotNetWorkloadsCheckup.cs b/UnoCheck/Checkups/DotNetWorkloadsCheckup.cs
@@ -24,10 +24,18 @@ public DotNetWorkloadsCheckup(SharedState sharedState, string sdkVersion, Manife
 
 			SdkRoot = dotnet.DotNetSdkLocation.FullName;
 			SdkVersion = sdkVersion;
-			RequiredWorkloads = requiredWorkloads.Where(w => w.SupportedPlatforms?.Contains(Util.Platform) ?? false).ToArray();
+			RequiredWorkloads = requiredWorkloads.Where(FilterPlatform).ToArray();
 			NuGetPackageSources = nugetPackageSources;
 		}
 
+		private static bool FilterPlatform(Manifest.DotNetWorkload w)
+		{
+			var arch = Util.IsArm64 ? "arm64" : "x64";
+			var targetPlatform = Util.Platform + "/" + arch;
+
+			return w.SupportedPlatforms?.Any(sp => sp == (sp.Contains("/") ? Util.Platform.ToString() : targetPlatform)) ?? false;
+		}
+
 		public readonly string SdkRoot;
 		public readonly string SdkVersion;
 		public readonly string[] NuGetPackageSources;
@@ -79,16 +87,16 @@ public override async Task<DiagnosticResult> Examine(SharedState history)
 					throw new Exception($"Unable to find workload manager for version [{rp.Id}: {rp.Version}]");
 				}
 
-                var installedPackageWorkloads = workloadManager.GetInstalledWorkloads();
+				var installedPackageWorkloads = workloadManager.GetInstalledWorkloads();
 
-                if (!NuGetVersion.TryParse(workloadVersion, out var rpVersion))
+				if (!NuGetVersion.TryParse(workloadVersion, out var rpVersion))
 					rpVersion = new NuGetVersion(0, 0, 0);
 
 #if DEBUG
-				foreach(var installedWorload in installedPackageWorkloads)
-                {
-                    ReportStatus($"Reported installed: {installedWorload.id}: {installedWorload.version}", null);
-                }
+				foreach (var installedWorload in installedPackageWorkloads)
+				{
+					ReportStatus($"Reported installed: {installedWorload.id}: {installedWorload.version}", null);
+				}
 #endif
 
 				// TODO: Eventually check actual workload resolver api for installed workloads and
@@ -109,7 +117,7 @@ public override async Task<DiagnosticResult> Examine(SharedState history)
 
 			var genericWorkloadManager = new DotNetWorkloadManager(SdkRoot, sdkVersion, NuGetPackageSources);
 
-            return new DiagnosticResult(
+			return new DiagnosticResult(
 				Status.Error,
 				this,
 				new Suggestion("Install or Update SDK Workloads",

diff --git a/UnoCheck/Manifest/DotNetWorkload.cs b/UnoCheck/Manifest/DotNetWorkload.cs
@@ -28,6 +28,6 @@ public partial class DotNetWorkload
 		public List<string> IgnoredPackIds { get; set; }
 
 		[JsonProperty("supportedPlatforms")]
-		public List<Platform> SupportedPlatforms { get; set; }
+		public List<string> SupportedPlatforms { get; set; }
 	}
 }
diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json
@@ -108,7 +108,7 @@
               "workloadManifestId": "microsoft.net.sdk.android",
               "packageId": "Microsoft.NET.Sdk.Android.Manifest-8.0.100",
               "version": "$(ANDROID_SDK_VERSION)",
-              "supportedPlatforms": [ "Windows", "OSX", "Linux" ]
+              "supportedPlatforms": [ "Windows", "OSX", "Linux/x64" ]
             },
             {
               "workloadId": "ios",