Users/jysin/manual val preview release (#13438)

Josh-01 · ManasaDevadas · bishal-pdMSFT · web-flow · commit e990086cfbc3 · 2020-08-20T22:29:48.000+05:30
* Manual validation Preview version release * Changed notifyUsers field name * Changed notifyUsers field name * Build Machine Image task is not able to execute the script inline with arguments (#13393) * Removed source command to run the inline script with argument * Removed source command from inline to run script with args * Update default.linux.template.json * Update default.managed.linux.template.json * task.json with patch no * Updated task.loc.json with patch number Co-authored-by: Bishal Prasad <biprasad@microsoft.com> * Updated stale bot * downgrade uuid npm package version (#13414) Co-authored-by: Alexander Prozorov <v-aprozo@microsoft.com> * Added changes from PR #10947. Bumped task version (#13422) Added changes from PR #10947. Bumped task version * Bumped version to include package in release * Minor version made aprint number Co-authored-by: Jyotsna Singh <jysin@microsoft.com> Co-authored-by: ManasaDevadas <manasadevadas@yahoo.com> Co-authored-by: Bishal Prasad <biprasad@microsoft.com> Co-authored-by: Leah Antkiewicz <leantk@microsoft.com> Co-authored-by: Alexander Prozorov <68694016+alexander-prozorov@users.noreply.github.com> Co-authored-by: Alexander Prozorov <v-aprozo@microsoft.com> Co-authored-by: Anatoly Bolshakov <anatoly.bolshakov@akvelon.com>
diff --git a/Tasks/ManualValidationV0/task.json b/Tasks/ManualValidationV0/task.json
@@ -15,8 +15,8 @@
     ],
     "version": {
         "Major": 0,
-        "Minor": 0,
-        "Patch": 2
+        "Minor": 174,
+        "Patch": 0
     },
     "preview": true,
     "inputs": [
diff --git a/Tasks/ManualValidationV0/task.loc.json b/Tasks/ManualValidationV0/task.loc.json
@@ -15,8 +15,8 @@
     ],
     "version": {
         "Major": 0,
-        "Minor": 0,
-        "Patch": 2
+        "Minor": 174,
+        "Patch": 0
     },
     "preview": true,
     "inputs": [
diff --git a/Tasks/SshV0/package-lock.json b/Tasks/SshV0/package-lock.json
diff --git a/Tasks/SshV0/package.json b/Tasks/SshV0/package.json
@@ -6,6 +6,6 @@
     "azure-pipelines-task-lib": "^2.9.3",
     "scp2": "0.5.0",
     "ssh2": "0.8.2",
-    "uuid": "^8.2.0"
+    "uuid": "^3.2.1"
   }
 }
diff --git a/Tasks/SshV0/task.json b/Tasks/SshV0/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 173,
-        "Patch": 1
+        "Minor": 174,
+        "Patch": 0
     },
     "demands": [],
     "minimumAgentVersion": "2.102.0",
diff --git a/Tasks/SshV0/task.loc.json b/Tasks/SshV0/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 173,
-    "Patch": 1
+    "Minor": 174,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "2.102.0",
diff --git a/Tasks/XcodeV5/Strings/resources.resjson/en-US/resources.resjson b/Tasks/XcodeV5/Strings/resources.resjson/en-US/resources.resjson
@@ -64,8 +64,12 @@
   "loc.input.help.cwd": "(Optional) Enter the working directory in which to run the build. If no value is entered, the root of the repository will be used.",
   "loc.input.label.useXcpretty": "Use xcpretty",
   "loc.input.help.useXcpretty": "Specify whether to use xcpretty to format xcodebuild output. Enabling this requires xcpretty to be installed on the agent machine. If xcpretty is not installed, raw xcodebuild output is shown. xcpretty is preinstalled on Azure Pipelines hosted build agents. See [xcpretty](https://github.com/supermarin/xcpretty) on GitHub.",
+  "loc.input.label.xcprettyArgs": "Xcpretty arguments",
+  "loc.input.help.xcprettyArgs": "Additional arguments to pass to xcpretty.",
   "loc.input.label.publishJUnitResults": "Publish test results to Azure Pipelines",
   "loc.input.help.publishJUnitResults": "Specify whether to publish JUnit test results to Azure Pipelines. This requires xcpretty to be enabled to generate JUnit test results.",
+  "loc.input.label.testRunTitle": "Test run title",
+  "loc.input.help.testRunTitle": "Title of the test run when publishing JUnit test results to Azure Pipelines.",
   "loc.messages.SignIdNotFound": "Failed to find the iOS signing identity. Verify that signing and provisioning information is provided.",
   "loc.messages.TempKeychainSetupFailed": "Failed to add the temporary keychain to the keychains search path.",
   "loc.messages.ProvProfileDetailsNotFound": "Failed to find details for the provisioning profile: %s",
diff --git a/Tasks/XcodeV5/postxcode.ts b/Tasks/XcodeV5/postxcode.ts
@@ -49,7 +49,8 @@ async function run() {
                         } else {
                             const TESTRUN_SYSTEM = "VSTS - xcode";
                             const tp = new tl.TestPublisher("JUnit");
-                            tp.publish(matchingTestResultsFiles, false, "", "", "", true, TESTRUN_SYSTEM);
+                            const testRunTitle: string = tl.getInput('testRunTitle');
+                            tp.publish(matchingTestResultsFiles, false, "", "", testRunTitle, true, TESTRUN_SYSTEM);
                         }
                     }
                 }
diff --git a/Tasks/XcodeV5/task.json b/Tasks/XcodeV5/task.json
@@ -12,8 +12,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 5,
-        "Minor": 170,
-        "Patch": 2
+        "Minor": 175,
+        "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.",
     "demands": [
@@ -331,6 +331,15 @@
             "helpMarkDown": "Specify whether to use xcpretty to format xcodebuild output. Enabling this requires xcpretty to be installed on the agent machine. If xcpretty is not installed, raw xcodebuild output is shown. xcpretty is preinstalled on Azure Pipelines hosted build agents. See [xcpretty](https://github.com/supermarin/xcpretty) on GitHub.",
             "groupName": "advanced"
         },
+        {
+            "name": "xcprettyArgs",
+            "type": "string",
+            "label": "Xcpretty arguments",
+            "required": false,
+            "helpMarkDown": "Additional arguments to pass to xcpretty.",
+            "groupName": "advanced",
+            "visibleRule": "useXcpretty == true"
+        },
         {
             "name": "publishJUnitResults",
             "type": "boolean",
@@ -339,6 +348,15 @@
             "defaultValue": false,
             "groupName": "advanced",
             "helpMarkDown": "Specify whether to publish JUnit test results to Azure Pipelines. This requires xcpretty to be enabled to generate JUnit test results."
+        },
+        {
+            "name": "testRunTitle",
+            "type": "string",
+            "label": "Test run title",
+            "required": false,
+            "groupName": "advanced",
+            "helpMarkDown": "Title of the test run when publishing JUnit test results to Azure Pipelines.",
+            "visibleRule": "publishJUnitResults == true"
         }
     ],
     "execution": {
diff --git a/Tasks/XcodeV5/task.loc.json b/Tasks/XcodeV5/task.loc.json
@@ -12,8 +12,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 170,
-    "Patch": 2
+    "Minor": 175,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [
@@ -331,6 +331,15 @@
       "helpMarkDown": "ms-resource:loc.input.help.useXcpretty",
       "groupName": "advanced"
     },
+    {
+      "name": "xcprettyArgs",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.xcprettyArgs",
+      "required": false,
+      "helpMarkDown": "ms-resource:loc.input.help.xcprettyArgs",
+      "groupName": "advanced",
+      "visibleRule": "useXcpretty == true"
+    },
     {
       "name": "publishJUnitResults",
       "type": "boolean",
@@ -339,6 +348,15 @@
       "defaultValue": false,
       "groupName": "advanced",
       "helpMarkDown": "ms-resource:loc.input.help.publishJUnitResults"
+    },
+    {
+      "name": "testRunTitle",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.testRunTitle",
+      "required": false,
+      "groupName": "advanced",
+      "helpMarkDown": "ms-resource:loc.input.help.testRunTitle",
+      "visibleRule": "publishJUnitResults == true"
     }
   ],
   "execution": {
diff --git a/Tasks/XcodeV5/xcode.ts b/Tasks/XcodeV5/xcode.ts
@@ -239,6 +239,10 @@ async function run() {
             let xcPrettyPath: string = tl.which('xcpretty', true);
             let xcPrettyTool: ToolRunner = tl.tool(xcPrettyPath);
             xcPrettyTool.arg(['-r', 'junit', '--no-color']);
+            const xcPrettyArgs: string = tl.getInput('xcprettyArgs');
+            if (xcPrettyArgs) {
+                xcPrettyTool.line(xcPrettyArgs);
+            }
 
             const logFile: string = utils.getUniqueLogFileName('xcodebuild');
             xcb.pipeExecOutputToTool(xcPrettyTool, logFile);
@@ -311,6 +315,11 @@ async function run() {
             if (useXcpretty) {
                 let xcPrettyTool: ToolRunner = tl.tool(tl.which('xcpretty', true));
                 xcPrettyTool.arg('--no-color');
+                const xcPrettyArgs: string = tl.getInput('xcprettyArgs');
+                if (xcPrettyArgs) {
+                    xcPrettyTool.line(xcPrettyArgs);
+                }
+
                 const logFile: string = utils.getUniqueLogFileName('xcodebuild_archive');
                 xcodeArchive.pipeExecOutputToTool(xcPrettyTool, logFile);
                 utils.setTaskState('XCODEBUILD_ARCHIVE_LOG', logFile);
@@ -460,6 +469,11 @@ async function run() {
                     if (useXcpretty) {
                         let xcPrettyTool: ToolRunner = tl.tool(tl.which('xcpretty', true));
                         xcPrettyTool.arg('--no-color');
+                        const xcPrettyArgs: string = tl.getInput('xcprettyArgs');
+                        if (xcPrettyArgs) {
+                            xcPrettyTool.line(xcPrettyArgs);
+                        }
+
                         const logFile: string = utils.getUniqueLogFileName('xcodebuild_export');
                         xcodeExport.pipeExecOutputToTool(xcPrettyTool, logFile);
                         utils.setTaskState('XCODEBUILD_EXPORT_LOG', logFile);

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"azure-pipelines-task-lib": "^2.9.3",`
`7`	`7`	`"scp2": "0.5.0",`
`8`	`8`	`"ssh2": "0.8.2",`
`9`		`- "uuid": "^8.2.0"`
	`9`	`+ "uuid": "^3.2.1"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ async function run() {`
`49`	`49`	`} else {`
`50`	`50`	`const TESTRUN_SYSTEM = "VSTS - xcode";`
`51`	`51`	`const tp = new tl.TestPublisher("JUnit");`
`52`		`- tp.publish(matchingTestResultsFiles, false, "", "", "", true, TESTRUN_SYSTEM);`
	`52`	`+ const testRunTitle: string = tl.getInput('testRunTitle');`
	`53`	`+ tp.publish(matchingTestResultsFiles, false, "", "", testRunTitle, true, TESTRUN_SYSTEM);`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`