Update Azure IoT extension to 0.10.11 (#14926)

Co-authored-by: Cindy Deng <[email protected]>
microsoft · Jun 3, 2021 · 014f239 · 014f239
1 parent 4083bf9
commit 014f239
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 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,