Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Azure IoT extension to 0.10.11 #14926

Merged
merged 1 commit into from
Jun 3, 2021
Merged

Update Azure IoT extension to 0.10.11 #14926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/AzureIoTEdgeV2/constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
13 changes: 0 additions & 13 deletions Tasks/AzureIoTEdgeV2/deployimage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureIoTEdgeV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 4,
"Patch": 7
"Patch": 8
},
"preview": false,
"showEnvironmentVariables": true,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureIoTEdgeV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 4,
"Patch": 7
"Patch": 8
},
"preview": false,
"showEnvironmentVariables": true,
Expand Down