Skip to content

Commit c7fc294

Browse files
authored
Merge branch 'master' into users/vinayakjoshi/Fixingproxyissueiwthpccrv2
2 parents 598c273 + 16c4e56 commit c7fc294

File tree

268 files changed

+13140
-1000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+13140
-1000
lines changed

Tasks/ArchiveFilesV2/make.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"archivePackages": [
44
{
55
"archiveName": "7zip.zip",
6-
"url": "https://vstsagenttools.blob.core.windows.net/tools/7zip/24.09/7zip.zip",
6+
"url": "https://vstsagenttools.blob.core.windows.net/tools/7zip/25.01/7zip.zip",
77
"dest": "./"
88
}
99
]

Tasks/ArchiveFilesV2/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"minimumAgentVersion": "2.182.1",
2020
"version": {
2121
"Major": 2,
22-
"Minor": 259,
22+
"Minor": 265,
2323
"Patch": 0
2424
},
2525
"groups": [

Tasks/ArchiveFilesV2/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"minimumAgentVersion": "2.182.1",
2020
"version": {
2121
"Major": 2,
22-
"Minor": 259,
22+
"Minor": 265,
2323
"Patch": 0
2424
},
2525
"groups": [

Tasks/AzureAppConfigurationExportV10/package-lock.json

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

Tasks/AzureAppConfigurationExportV10/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@types/mocha": "^5.2.7",
2424
"agent-base": "^6.0.2",
2525
"azure-pipelines-task-lib": "^4.13.0",
26-
"azure-pipelines-tasks-azure-arm-rest": "^3.254.0"
26+
"azure-pipelines-tasks-azure-arm-rest": "^3.263.1"
2727
},
2828
"devDependencies": {
2929
"typescript": "5.1.6"

Tasks/AzureAppConfigurationExportV10/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "Microsoft Corporation",
1010
"version": {
1111
"Major": 10,
12-
"Minor": 255,
12+
"Minor": 264,
1313
"Patch": 0
1414
},
1515
"instanceNameFormat": "Azure App Configuration",

Tasks/AzureAppConfigurationExportV10/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "Microsoft Corporation",
1010
"version": {
1111
"Major": 10,
12-
"Minor": 255,
12+
"Minor": 264,
1313
"Patch": 0
1414
},
1515
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureAppConfigurationImportV10/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ async function run(): Promise<void> {
2020
tl.setResult(tl.TaskResult.Succeeded, "", true);
2121
}
2222
catch (e) {
23-
23+
2424
if (Utils.IsInstanceOf(e, "ArgumentError") ||Utils.IsInstanceOf(e, "ParseError") || e instanceof AppConfigurationError) {
2525

2626
tl.error(e.message);
@@ -36,7 +36,7 @@ async function run(): Promise<void> {
3636
}
3737
else if (e instanceof RestError) {
3838

39-
tl.loc("RestError",e.name !== undefined? e.name: "", e.code !== undefined ? e.code: "", e.statusCode, e.request.url, e.message, e.request.headers.get("x-ms-client-request-id"));
39+
tl.error(tl.loc("RestError",e.name !== undefined? e.name: "", e.code !== undefined ? e.code: "", e.statusCode, e.request.url, e.message, e.request.headers.get("x-ms-client-request-id")));
4040
tl.debug(e.response?.bodyAsText);
4141
}
4242
else {

Tasks/AzureAppConfigurationImportV10/package-lock.json

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

Tasks/AzureAppConfigurationImportV10/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@types/node": "^20.3.1",
2424
"agent-base": "^6.0.2",
2525
"azure-pipelines-task-lib": "^4.13.0",
26-
"azure-pipelines-tasks-azure-arm-rest": "^3.254.0"
26+
"azure-pipelines-tasks-azure-arm-rest": "^3.263.1"
2727
},
2828
"devDependencies": {
2929
"typescript": "5.1.6"

0 commit comments

Comments
 (0)