From b1ecfabc7146c6820f7006ce6cd5d5da49a8dfb1 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 9 Oct 2017 16:41:03 +0100 Subject: [PATCH 1/2] [Xamarin.Android.Build.Tasks] AndroidSdk GetPlatformDirectoryFromApiLevel returns null Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=59962 `GetPlatformDirectoryFromApiLevel` is returning null. All of the places we are expecting this to return just the path even if it does not exist. So rather than checking if it exists in this method we will just return the information we get. --- src/Xamarin.Android.Build.Utilities/AndroidSdk.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs b/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs index 22f8edc266d..b80965b0c0e 100644 --- a/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs +++ b/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs @@ -100,11 +100,7 @@ public static string GetPlatformDirectoryFromApiLevel (string apiLevel, AndroidV return dir; var level = versions.GetApiLevelFromId (id); - dir = level.HasValue ? GetPlatformDirectory (level.Value) : null; - if (dir != null && Directory.Exists (dir)) - return dir; - - return null; + return level.HasValue ? GetPlatformDirectory (level.Value) : null; } public static bool IsPlatformInstalled (int apiLevel) From b036dd7e3c0e28af2d2155a9fd891491088a3f0f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 9 Oct 2017 20:11:15 +0100 Subject: [PATCH 2/2] Always return a value. --- src/Xamarin.Android.Build.Utilities/AndroidSdk.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs b/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs index b80965b0c0e..ba2cdb3abee 100644 --- a/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs +++ b/src/Xamarin.Android.Build.Utilities/AndroidSdk.cs @@ -100,7 +100,7 @@ public static string GetPlatformDirectoryFromApiLevel (string apiLevel, AndroidV return dir; var level = versions.GetApiLevelFromId (id); - return level.HasValue ? GetPlatformDirectory (level.Value) : null; + return level.HasValue ? GetPlatformDirectory (level.Value) : dir; } public static bool IsPlatformInstalled (int apiLevel)