Skip to content

Commit

Permalink
Merge branch 'master' into Tasks/Common/utility-common/node16
Browse files Browse the repository at this point in the history
  • Loading branch information
tintse-thxsky-MSFT authored Oct 6, 2022
2 parents 85ceeb9 + 00d070d commit a808a45
Show file tree
Hide file tree
Showing 46 changed files with 887 additions and 326 deletions.
553 changes: 478 additions & 75 deletions Tasks/AzureKeyVaultV1/npm-shrinkwrap.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Tasks/AzureKeyVaultV1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@types/q": "^1.5.0",
"@types/uuid": "^8.3.0",
"azure-pipelines-task-lib": "2.8.0",
"azure-pipelines-tasks-azure-arm-rest-v2": "1.0.4",
"azure-pipelines-tasks-azure-arm-rest-v2": "^2.210.0",
"moment": "^2.29.4",
"vso-node-api": "6.0.1-preview"
},
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureKeyVaultV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 211,
"Patch": 2
"Minor": 212,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureKeyVaultV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 211,
"Patch": 2
"Minor": 212,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "2.0.0",
Expand Down
81 changes: 44 additions & 37 deletions Tasks/CocoaPodsV0/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Tasks/CocoaPodsV0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"homepage": "https://github.com/Microsoft/azure-pipelines-tasks#readme",
"dependencies": {
"@types/mocha": "^5.2.7",
"@types/node": "^10.17.0",
"azure-pipelines-task-lib": "^3.3.1"
"@types/node": "^16.11.39",
"azure-pipelines-task-lib": "^4.0.0-preview"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
6 changes: 5 additions & 1 deletion Tasks/CocoaPodsV0/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 0,
"Minor": 207,
"Minor": 212,
"Patch": 0
},
"groups": [
Expand Down Expand Up @@ -63,6 +63,10 @@
"Node10": {
"target": "cocoapods.js",
"argumentFormat": ""
},
"Node16": {
"target": "cocoapods.js",
"argumentFormat": ""
}
},
"restrictions": {
Expand Down
6 changes: 5 additions & 1 deletion Tasks/CocoaPodsV0/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 0,
"Minor": 207,
"Minor": 212,
"Patch": 0
},
"groups": [
Expand Down Expand Up @@ -63,6 +63,10 @@
"Node10": {
"target": "cocoapods.js",
"argumentFormat": ""
},
"Node16": {
"target": "cocoapods.js",
"argumentFormat": ""
}
},
"restrictions": {
Expand Down
4 changes: 2 additions & 2 deletions Tasks/InstallAppleCertificateV2/make.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"rm": [
{
"items": [
"node_modules/azure-pipelines-tasks-ios-signing-common/node_modules/vsts-task-lib"
"node_modules/azure-pipelines-tasks-ios-signing-common/node_modules/azure-pipelines-task-lib"
],
"options": "-Rf"
},
{
"items": [
"node_modules/azure-pipelines-tasks-securefiles-common/node_modules/vsts-task-lib"
"node_modules/azure-pipelines-tasks-securefiles-common/node_modules/azure-pipelines-task-lib"
],
"options": "-Rf"
}
Expand Down
Loading

0 comments on commit a808a45

Please sign in to comment.