Added secondary location check for pbxProject

microsoft · Apr 15, 2021 · 90e797a · 90e797a
1 parent e8abe8b
commit 90e797a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Tasks/XcodeV5/task.json b/Tasks/XcodeV5/task.json
@@ -12,7 +12,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 5,
-        "Minor": 185,
+        "Minor": 186,
         "Patch": 0
     },
     "releaseNotes": "This version of the task is compatible with Xcode 8 - 11. Features that were solely to maintain compatibility with Xcode 7 have been removed. This task has better options for using Microsoft-hosted macOS agents.",

diff --git a/Tasks/XcodeV5/task.loc.json b/Tasks/XcodeV5/task.loc.json
@@ -12,7 +12,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 185,
+    "Minor": 186,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

diff --git a/Tasks/XcodeV5/xcodeutils.ts b/Tasks/XcodeV5/xcodeutils.ts
@@ -145,6 +145,13 @@ function getPbxProjectPath(workspace: string) {
     if (workspace && workspace.trim().toLowerCase().endsWith('.xcworkspace')) {
         let pbxProjectPath: string = workspace.trim().toLowerCase().replace('.xcworkspace', '.pbxproj');
 
+        if (pathExistsAsFile(pbxProjectPath)) {
+            return pbxProjectPath;
+        }
+
+        tl.debug("Corresponding pbxProject file doesn't exist: " + pbxProjectPath + ", checking alternative location");
+
+        pbxProjectPath = workspace.trim().toLowerCase().replace('.xcworkspace', '.xcodeproj/project.pbxproj');
         if (pathExistsAsFile(pbxProjectPath)) {
             return pbxProjectPath;
         }