Prefer /Applications/Xcode.app to xcode-select path

Mimics VSmac behavior. Fixes microsoft#249.
sandyarmstrong · May 11, 2018 · 59e1276 · 59e1276
1 parent 89dfe29
commit 59e1276
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Clients/Xamarin.Interactive.MTouch/MTouchSdkTool.cs b/Clients/Xamarin.Interactive.MTouch/MTouchSdkTool.cs
@@ -28,6 +28,7 @@ public static class MTouchSdkTool
         const string XamarinStudioMlaunchPath = "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/" +
             "AddIns/MonoDevelop.IPhone/mlaunch.app/Contents/MacOS/mlaunch";
         const string XamariniOSMlaunchPath = "/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mlaunch";
+        const string DefaultSdkRoot = "/Applications/Xcode.app/Contents/Developer";
 
         public static readonly Version RequiredMinimumXcodeVersion = new Version (9, 0);
 
@@ -68,7 +69,8 @@ static string RunTool (string fileName, string arguments)
 
         public static string GetXcodeSdkRoot ()
         {
-            var sdkRoot = GetXamarinStudioXcodeSdkRoot () ?? GetXcodeSelectXcodeSdkRoot ();
+            // Mimicking VSmac behavior, xcode-select is checked last
+            var sdkRoot = GetXamarinStudioXcodeSdkRoot () ?? GetDefaultXCodeSdkRoot () ?? GetXcodeSelectXcodeSdkRoot ();
             if (sdkRoot == null)
                 throw new Exception (Catalog.SharedStrings.XcodeNotFoundMessage);
             return sdkRoot;
@@ -92,6 +94,9 @@ public static Version GetXcodeVersion (string sdkRoot)
             }
         }
 
+        static string GetDefaultXCodeSdkRoot ()
+            => Directory.Exists (DefaultSdkRoot) ? DefaultSdkRoot : null;
+
         static string GetXcodeSelectXcodeSdkRoot ()
         {
             try {