Fix bug in xcode task when project argument is specified and workspace is not used

Author: madhurig

Tasks/Xcode/task.json

@@ -12,7 +12,7 @@
     "version": {
         "Major": 2,
         "Minor": 1,
-        "Patch": 21
+        "Patch": 22
     },
     "demands": [
         "xcode"

Tasks/Xcode/task.loc.json

@@ -12,7 +12,7 @@
   "version": {
     "Major": 2,
     "Minor": 1,
-    "Patch": 21
+    "Patch": 22
   },
   "demands": [
     "xcode"

Tasks/Xcode/xcode.ts

@@ -71,7 +71,7 @@ async function run() {
         var xcb: ToolRunner = tl.createToolRunner(tool);
         xcb.argIf(sdk, ['-sdk', sdk]);
         xcb.argIf(configuration, ['-configuration', configuration]);
-        if(ws) {
+        if(ws && tl.filePathSupplied('xcWorkspacePath')) {
             xcb.arg('-workspace');
             xcb.pathArg(ws);
         }

Tests/L0/Xcode/_suite.ts

@@ -127,6 +127,58 @@ describe('Xcode Suite', function() {
             })
     })
 
+    it('run Xcode with project and no workspace', (done) => {
+        setResponseFile('responseProject.json');
+
+        var tr = new trm.TaskRunner('Xcode', true, true);
+        tr.setInput('actions', 'build');
+        tr.setInput('configuration', '$(Configuration)');
+        tr.setInput('sdk', '$(SDK)');
+        tr.setInput('xcWorkspacePath', '/user/build');
+        tr.setInput('scheme', '');
+        tr.setInput('packageApp', 'true');
+        tr.setInput('signMethod', 'file');
+        tr.setInput('p12', '/user/build');
+        tr.setInput('p12pwd', '');
+        tr.setInput('provProfile', '/user/build');
+        tr.setInput('removeProfile', 'false');
+        tr.setInput('unlockDefaultKeychain', 'false');
+        tr.setInput('defaultKeychainPassword', '');
+        tr.setInput('iosSigningIdentity', '');
+        tr.setInput('provProfileUuid', '');
+        tr.setInput('args', '-project test.xcodeproj');
+        tr.setInput('cwd', '/user/build');
+        tr.setInput('outputPattern', 'output/$(SDK)/$(Configuration)');
+        tr.setInput('xcodeDeveloperDir', '');
+        tr.setInput('useXctool', 'false');
+        tr.setInput('xctoolReporter', '');
+        tr.setInput('publishJUnitResults', 'false');
+
+        tr.run()
+            .then(() => {
+                assert(tr.ran('/home/bin/xcodebuild -version'), 'xcodebuild for version should have been run.');
+                assert(tr.ran('/home/bin/xcodebuild -sdk $(SDK) -configuration $(Configuration) ' +
+                        'build DSTROOT=/user/build/output/$(SDK)/$(Configuration)/build.dst ' +
+                        'OBJROOT=/user/build/output/$(SDK)/$(Configuration)/build.obj ' +
+                        'SYMROOT=/user/build/output/$(SDK)/$(Configuration)/build.sym ' +
+                        'SHARED_PRECOMPS_DIR=/user/build/output/$(SDK)/$(Configuration)/build.pch ' +
+                        '-project test.xcodeproj'),
+                    'xcodebuild for building the ios project should have been run.');
+                assert(tr.ran('/home/bin/xcrun -sdk $(SDK) PackageApplication ' +
+                        '-v /user/build/output/$(SDK)/$(Configuration)/build.sym/Release.iphoneos/fun.app ' +
+                        '-o /user/build/output/$(SDK)/$(Configuration)/build.sym/Release.iphoneos/fun.ipa'),
+                    "xcrun to package the app and generate an .ipa should have been run.");
+                assert(tr.invokedToolCount == 3, 'should have xcodebuild for version, xcodebuild for build and xcrun for packaging');
+                assert(tr.resultWasSet, 'task should have set a result');
+                assert(tr.stderr.length == 0, 'should not have written to stderr');
+                assert(tr.succeeded, 'task should have succeeded');
+                done();
+            })
+            .fail((err) => {
+                done(err);
+            })
+    })
+
     it('run Xcode build with test action, publish test results', (done) => {
         setResponseFile('responseXctool.json');
 

Tests/L0/Xcode/responseErrorArgs.json

@@ -19,7 +19,7 @@
       "code": 0,
       "stdout": "Xcode 7.3.1"
     },
-    "/home/bin/xcodebuild -workspace /user/build build DSTROOT=/user/build/output/$(SDK)/$(Configuration)/build.dst OBJROOT=/user/build/output/$(SDK)/$(Configuration)/build.obj SYMROOT=/user/build/output/$(SDK)/$(Configuration)/build.sym SHARED_PRECOMPS_DIR=/user/build/output/$(SDK)/$(Configuration)/build.pch" : {
+    "/home/bin/xcodebuild build DSTROOT=/user/build/output/$(SDK)/$(Configuration)/build.dst OBJROOT=/user/build/output/$(SDK)/$(Configuration)/build.obj SYMROOT=/user/build/output/$(SDK)/$(Configuration)/build.sym SHARED_PRECOMPS_DIR=/user/build/output/$(SDK)/$(Configuration)/build.pch": {
       "code": 0,
       "stdout": "xcodebuild output here"
     }

Tests/L0/Xcode/responseProject.json

@@ -0,0 +1,33 @@
+{
+  "which": {
+    "xcodebuild": "/home/bin/xcodebuild",
+    "xcrun": "/home/bin/xcrun"
+  },
+  "checkPath" : {
+    "/home/bin/xcodebuild": true,
+    "/home/bin/xcrun": true
+  },
+  "getVariable": {
+    "build.sourcesDirectory": "/user/build",
+    "HOME": "/users/test"
+  },
+  "glob": {
+    "/user/build/output/$(SDK)/$(Configuration)/build.sym/**/*.app": [
+      "/user/build/output/$(SDK)/$(Configuration)/build.sym/Release.iphoneos/fun.app"
+    ]
+  },
+  "exec": {
+    "/home/bin/xcodebuild -version": {
+      "code": 0,
+      "stdout": "Xcode 7.3.1"
+    },
+    "/home/bin/xcodebuild -sdk $(SDK) -configuration $(Configuration) build DSTROOT=/user/build/output/$(SDK)/$(Configuration)/build.dst OBJROOT=/user/build/output/$(SDK)/$(Configuration)/build.obj SYMROOT=/user/build/output/$(SDK)/$(Configuration)/build.sym SHARED_PRECOMPS_DIR=/user/build/output/$(SDK)/$(Configuration)/build.pch -project test.xcodeproj": {
+      "code": 0,
+      "stdout": "xcodebuild output here"
+    },
+    "/home/bin/xcrun -sdk $(SDK) PackageApplication -v /user/build/output/$(SDK)/$(Configuration)/build.sym/Release.iphoneos/fun.app -o /user/build/output/$(SDK)/$(Configuration)/build.sym/Release.iphoneos/fun.ipa": {
+      "code": 0,
+      "stdout": "xcrun output here"
+    }
+  }
+}