Skip to content

Commit 30577e1

Browse files
authored
Revert "Hotfix: Update Azure IoT extension to 0.10.11 (#14927)" (#14928)
This reverts commit 7dc9043.
1 parent f631a97 commit 30577e1

File tree

14 files changed

+574
-6772
lines changed

14 files changed

+574
-6772
lines changed

Tasks/AzureIoTEdgeV2/constant.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ export default class Constants {
2828
public static defaultExecOption = {} as IExecSyncOptions;
2929
public static UTF8 = "utf8";
3030
public static outputVariableDeploymentPathKey = "DEPLOYMENT_FILE_PATH";
31-
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";
31+
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";
3232
}

Tasks/AzureIoTEdgeV2/deployimage.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,19 @@ class azureclitask {
123123
throw new Error(`View Az Version Error: ${outputStream.content}`);
124124
}
125125

126+
// Upgrade setuptools in azcli's private python environment to avoid conflict when installing azure-iot extension
127+
// temporary solution until the paho-mqtt error in win2016 goes away
128+
if(tl.osType() === Constants.osTypeWindows)
129+
{
130+
let pythonExeLocation : string = 'C:\\Program Files (x86)\\Microsoft SDKs\\Azure\\CLI2\\python.exe';
131+
let setupToolsInstallationCommand = ['-m', 'pip', 'install', '-U', 'setuptools==52.0.0'];
132+
let upgradeSetuptoolsResult = tl.execSync(pythonExeLocation, setupToolsInstallationCommand, execOptions);
133+
if(upgradeSetuptoolsResult.code !== 0)
134+
{
135+
throw new Error(`Upgrade setuptools Error: ${outputStream.content}`);
136+
}
137+
}
138+
126139
let addResult = tl.execSync('az', installCommand, Constants.execSyncSilentOption);
127140
tl.debug(JSON.stringify(addResult));
128141
if (addResult.code !== 0) {

Tasks/AzureIoTEdgeV2/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 4,
17-
"Patch": 8
17+
"Patch": 7
1818
},
1919
"preview": false,
2020
"showEnvironmentVariables": true,

Tasks/AzureIoTEdgeV2/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 4,
17-
"Patch": 8
17+
"Patch": 7
1818
},
1919
"preview": false,
2020
"showEnvironmentVariables": true,

Tasks/DownloadBuildArtifactsV0/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/DownloadBuildArtifactsV0/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@types/mocha": "^5.2.7",
2222
"azure-pipelines-task-lib": "^3.1.0",
2323
"azure-devops-node-api": "7.2.0",
24-
"artifact-engine": "1.0.1",
24+
"artifact-engine": "1.0.0",
2525
"decompress-zip": "0.3.3"
2626
},
2727
"devDependencies": {

Tasks/DownloadBuildArtifactsV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": {
1111
"Major": 0,
1212
"Minor": 188,
13-
"Patch": 3
13+
"Patch": 2
1414
},
1515
"groups": [
1616
{

Tasks/DownloadBuildArtifactsV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": {
1111
"Major": 0,
1212
"Minor": 188,
13-
"Patch": 3
13+
"Patch": 2
1414
},
1515
"groups": [
1616
{

Tasks/JavaToolInstallerV0/package-lock.json

Lines changed: 444 additions & 3448 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/JavaToolInstallerV0/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@types/mocha": "^5.2.7",
2727
"@types/node": "^10.17.0",
2828
"@types/q": "^1.0.7",
29-
"azp-tasks-az-blobstorage-provider-v2": "2.0.3",
29+
"azp-tasks-az-blobstorage-provider-v2": "2.0.0-preview.0",
3030
"azure-pipelines-task-lib": "^3.1.0",
3131
"azure-pipelines-tasks-azure-arm-rest-v2": "2.0.0-preview.0",
3232
"azure-pipelines-tool-lib": "^1.0.1",

0 commit comments

Comments
 (0)