Hotfix: Update Azure IoT extension to 0.10.11 (#14927)

* ArtifactEngine version bumped up in DownloadBuildArtifacts task (#14898) * ArtifactEngine version bumped up in DownloadBuildArtifacts task * Task version bumped up * bump package version and upgrade artifact-engine (#14885) * [JavaToolInstallerV0] Upgrade azp-tasks-az-blobstorage-provider-v2 (#14887) * Update Azure IoT extension to 0.10.11 Co-authored-by: Denis Rumyantsev <61472718+DenisRumyantsev@users.noreply.github.com> Co-authored-by: Maxim Zaytsev <v-mazayt@microsoft.com> Co-authored-by: Cindy Deng <cindydeng@microsoft.com>
microsoft · Jun 3, 2021 · 7dc9043 · 7dc9043
1 parent 398ba92
commit 7dc9043
Show file tree

Hide file tree

Showing 14 changed files with 6,763 additions and 565 deletions.
diff --git a/Tasks/AzureIoTEdgeV2/constant.ts b/Tasks/AzureIoTEdgeV2/constant.ts
@@ -28,5 +28,5 @@ export default class Constants {
   public static defaultExecOption = {} as IExecSyncOptions;
   public static UTF8 = "utf8";
   public static outputVariableDeploymentPathKey = "DEPLOYMENT_FILE_PATH";
-  public static azureCliIotExtensionDefaultSource = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v0.10.10/azure_iot-0.10.10-py3-none-any.whl";
+  public static azureCliIotExtensionDefaultSource = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v0.10.11/azure_iot-0.10.11-py3-none-any.whl";
 }
diff --git a/Tasks/AzureIoTEdgeV2/deployimage.ts b/Tasks/AzureIoTEdgeV2/deployimage.ts
@@ -123,19 +123,6 @@ class azureclitask {
       throw new Error(`View Az Version Error: ${outputStream.content}`);
     }
 
-    // Upgrade setuptools in azcli's private python environment to avoid conflict when installing azure-iot extension
-    // temporary solution until the paho-mqtt error in win2016 goes away 
-    if(tl.osType() === Constants.osTypeWindows)
-    {
-      let pythonExeLocation : string = 'C:\\Program Files (x86)\\Microsoft SDKs\\Azure\\CLI2\\python.exe';
-      let setupToolsInstallationCommand = ['-m', 'pip', 'install', '-U', 'setuptools==52.0.0'];
-      let upgradeSetuptoolsResult = tl.execSync(pythonExeLocation, setupToolsInstallationCommand, execOptions);
-      if(upgradeSetuptoolsResult.code !== 0)
-      {
-        throw new Error(`Upgrade setuptools Error: ${outputStream.content}`);
-      }
-    }
-
     let addResult = tl.execSync('az', installCommand, Constants.execSyncSilentOption);
     tl.debug(JSON.stringify(addResult));
     if (addResult.code !== 0) {

diff --git a/Tasks/AzureIoTEdgeV2/task.json b/Tasks/AzureIoTEdgeV2/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 4,
-        "Patch": 7
+        "Patch": 8
     },
     "preview": false,
     "showEnvironmentVariables": true,

diff --git a/Tasks/AzureIoTEdgeV2/task.loc.json b/Tasks/AzureIoTEdgeV2/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 4,
-    "Patch": 7
+    "Patch": 8
   },
   "preview": false,
   "showEnvironmentVariables": true,

diff --git a/Tasks/DownloadBuildArtifactsV0/package-lock.json b/Tasks/DownloadBuildArtifactsV0/package-lock.json
diff --git a/Tasks/DownloadBuildArtifactsV0/package.json b/Tasks/DownloadBuildArtifactsV0/package.json
@@ -21,7 +21,7 @@
     "@types/mocha": "^5.2.7",
     "azure-pipelines-task-lib": "^3.1.0",
     "azure-devops-node-api": "7.2.0",
-    "artifact-engine": "1.0.0",
+    "artifact-engine": "1.0.1",
     "decompress-zip": "0.3.3"
   },
   "devDependencies": {

diff --git a/Tasks/DownloadBuildArtifactsV0/task.json b/Tasks/DownloadBuildArtifactsV0/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 188,
-        "Patch": 2
+        "Patch": 3
     },
     "groups": [
         {

diff --git a/Tasks/DownloadBuildArtifactsV0/task.loc.json b/Tasks/DownloadBuildArtifactsV0/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 188,
-    "Patch": 2
+    "Patch": 3
   },
   "groups": [
     {

diff --git a/Tasks/JavaToolInstallerV0/package-lock.json b/Tasks/JavaToolInstallerV0/package-lock.json
diff --git a/Tasks/JavaToolInstallerV0/package.json b/Tasks/JavaToolInstallerV0/package.json
@@ -26,7 +26,7 @@
         "@types/mocha": "^5.2.7",
         "@types/node": "^10.17.0",
         "@types/q": "^1.0.7",
-        "azp-tasks-az-blobstorage-provider-v2": "2.0.0-preview.0",
+        "azp-tasks-az-blobstorage-provider-v2": "2.0.3",
         "azure-pipelines-task-lib": "^3.1.0",
         "azure-pipelines-tasks-azure-arm-rest-v2": "2.0.0-preview.0",
         "azure-pipelines-tool-lib": "^1.0.1",

diff --git a/Tasks/JavaToolInstallerV0/task.json b/Tasks/JavaToolInstallerV0/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 0,
         "Minor": 188,
-        "Patch": 0
+        "Patch": 1
     },
     "satisfies": [
         "Java",

diff --git a/Tasks/JavaToolInstallerV0/task.loc.json b/Tasks/JavaToolInstallerV0/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 188,
-    "Patch": 0
+    "Patch": 1
   },
   "satisfies": [
     "Java",