Skip to content

Commit 6b64f49

Browse files
Maxim ZaytsevDmitriiBobreshevDmitrii Bobreshev (Akvelon INC)
authored
Rebuild tasks to remove mockery from the package (#19730)
* Rebuild tasks to remove mockery from the package * Add variable to not fail deprecated tasks * Revert "Add variable to not fail deprecated tasks" This reverts commit 526bb34. * fix test when deprecated FF is on --------- Co-authored-by: Dmitrii Bobreshev <[email protected]> Co-authored-by: Dmitrii Bobreshev (Akvelon INC) <[email protected]>
1 parent c57c056 commit 6b64f49

File tree

287 files changed

+25922
-277
lines changed

Some content is hidden

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

287 files changed

+25922
-277
lines changed

‎Tasks/DotNetCoreCLIV2/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"demands": [],
1818
"version": {
1919
"Major": 2,
20-
"Minor": 236,
20+
"Minor": 238,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.144.0",

‎Tasks/DotNetCoreCLIV2/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"demands": [],
1818
"version": {
1919
"Major": 2,
20-
"Minor": 236,
20+
"Minor": 238,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.144.0",

‎Tasks/DotNetCoreInstallerV0/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 220,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"satisfies": [

‎Tasks/DotNetCoreInstallerV0/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 220,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"satisfies": [

‎Tasks/DotNetCoreInstallerV1/Tests/L0.ts

+31-9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ function setResponseFile(name) {
99
process.env['MOCK_RESPONSES'] = path.join(__dirname, name);
1010
}
1111

12+
function getEnvVariable(envName) {
13+
return process.env[envName] || null
14+
}
15+
1216
function runValidations(validator: () => void, tr, done) {
1317
try {
1418
validator();
@@ -420,11 +424,17 @@ describe('DotNetCoreInstaller', function () {
420424
let tr = new ttm.MockTestRunner(path.join(__dirname, "dotnetcoreInstallerTests.js"))
421425
tr.run();
422426
runValidations(() => {
427+
if (Boolean(getEnvVariable('FAIL_DEPRECATED_BUILD_TASK'))) {
428+
assert(tr.succeeded == false, ("Should failed when FF is on."));
429+
assert(tr.stdout.indexOf("DeprecatedTask") > -1, "Should throw DeprecatedTask error.");
430+
431+
} else {
423432
assert(tr.succeeded == true, ("Should have passed."));
424433
assert(tr.stdout.indexOf("PrependingInstallationPath") > -1, "Should have prepended installation path");
425434
assert(tr.stdout.indexOf("PrependGlobalToolPath") > -1, "Should have printed this message as addDotNetCoreToolPath function should have been called.");
426435
assert(tr.stdout.indexOf("PrependingGlobalToolPath") > -1, "Should have prepended global tool path");
427436
assert(tr.stdout.indexOf("DownloadAndInstallCalled") == -1, "Should not have printed this message as DownloadAndInstall function should not have been called.");
437+
}
428438
}, tr, done);
429439
});
430440

@@ -433,11 +443,17 @@ describe('DotNetCoreInstaller', function () {
433443
let tr = new ttm.MockTestRunner(path.join(__dirname, "dotnetcoreInstallerTests.js"))
434444
tr.run();
435445
runValidations(() => {
436-
assert(tr.succeeded == true, ("Should have passed."));
437-
assert(tr.stdout.indexOf("PrependingInstallationPath") > -1, "Should have prepended installation path");
438-
assert(tr.stdout.indexOf("PrependGlobalToolPath") > -1, "Should have printed this message as addDotNetCoreToolPath function should have been called.");
439-
assert(tr.stdout.indexOf("PrependingGlobalToolPath") > -1, "Should have prepended global tool path");
440-
assert(tr.stdout.indexOf("DownloadAndInstallCalled") > -1, "Should have printed this message as DownloadAndInstall function should have been called.");
446+
if (Boolean(getEnvVariable('FAIL_DEPRECATED_BUILD_TASK'))) {
447+
assert(tr.succeeded == false, ("Should failed when FF is on."));
448+
assert(tr.stdout.indexOf("DeprecatedTask") > -1, "Should throw DeprecatedTask error.");
449+
450+
} else {
451+
assert(tr.succeeded == true, ("Should have passed."));
452+
assert(tr.stdout.indexOf("PrependingInstallationPath") > -1, "Should have prepended installation path");
453+
assert(tr.stdout.indexOf("PrependGlobalToolPath") > -1, "Should have printed this message as addDotNetCoreToolPath function should have been called.");
454+
assert(tr.stdout.indexOf("PrependingGlobalToolPath") > -1, "Should have prepended global tool path");
455+
assert(tr.stdout.indexOf("DownloadAndInstallCalled") > -1, "Should have printed this message as DownloadAndInstall function should have been called.");
456+
}
441457
}, tr, done);
442458
});
443459

@@ -446,10 +462,16 @@ describe('DotNetCoreInstaller', function () {
446462
let tr = new ttm.MockTestRunner(path.join(__dirname, "dotnetcoreInstallerTests.js"))
447463
tr.run();
448464
runValidations(() => {
449-
assert(tr.succeeded == true, ("Should have passed."));
450-
assert(tr.stdout.indexOf("PrependingInstallationPath") > -1, "Should have prepended installation path");
451-
assert(tr.stdout.indexOf("PrependGlobalToolPath") > -1, "Should have printed this message as addDotNetCoreToolPath function should have been called.");
452-
assert(tr.stdout.indexOf("ErrorWhileSettingDotNetToolPath") > -1, "Should have printed this message as error must have been encountered while setting GlobalToolPath.");
465+
if (Boolean(getEnvVariable('FAIL_DEPRECATED_BUILD_TASK'))) {
466+
assert(tr.succeeded == false, ("Should failed when FF is on."));
467+
assert(tr.stdout.indexOf("DeprecatedTask") > -1, "Should throw DeprecatedTask error.");
468+
469+
} else {
470+
assert(tr.succeeded == true, ("Should have passed."));
471+
assert(tr.stdout.indexOf("PrependingInstallationPath") > -1, "Should have prepended installation path");
472+
assert(tr.stdout.indexOf("PrependGlobalToolPath") > -1, "Should have printed this message as addDotNetCoreToolPath function should have been called.");
473+
assert(tr.stdout.indexOf("ErrorWhileSettingDotNetToolPath") > -1, "Should have printed this message as error must have been encountered while setting GlobalToolPath.");
474+
}
453475
}, tr, done);
454476
});
455477
});

‎Tasks/DotNetCoreInstallerV1/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 235,
17-
"Patch": 4
16+
"Minor": 238,
17+
"Patch": 0
1818
},
1919
"deprecated": true,
2020
"removalDate": "2024-01-31",

‎Tasks/DotNetCoreInstallerV1/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 235,
17-
"Patch": 4
16+
"Minor": 238,
17+
"Patch": 0
1818
},
1919
"deprecated": true,
2020
"removalDate": "2024-01-31",

‎Tasks/GradleV3/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 3,
19-
"Minor": 231,
19+
"Minor": 238,
2020
"Patch": 0
2121
},
2222
"releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",

‎Tasks/GradleV3/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 3,
19-
"Minor": 231,
19+
"Minor": 238,
2020
"Patch": 0
2121
},
2222
"releaseNotes": "ms-resource:loc.releaseNotes",

‎Tasks/GruntV0/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 0,
19-
"Minor": 231,
19+
"Minor": 238,
2020
"Patch": 0
2121
},
2222
"demands": [

‎Tasks/GruntV0/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 0,
19-
"Minor": 231,
19+
"Minor": 238,
2020
"Patch": 0
2121
},
2222
"demands": [

‎Tasks/GulpV0/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 0,
19-
"Minor": 231,
19+
"Minor": 238,
2020
"Patch": 0
2121
},
2222
"demands": [

‎Tasks/GulpV0/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 0,
19-
"Minor": 231,
19+
"Minor": 238,
2020
"Patch": 0
2121
},
2222
"demands": [

‎Tasks/GulpV1/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"preview": true,
1818
"version": {
1919
"Major": 1,
20-
"Minor": 231,
20+
"Minor": 238,
2121
"Patch": 0
2222
},
2323
"demands": [

‎Tasks/GulpV1/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"preview": true,
1818
"version": {
1919
"Major": 1,
20-
"Minor": 231,
20+
"Minor": 238,
2121
"Patch": 0
2222
},
2323
"demands": [

‎Tasks/InstallAppleCertificateV2/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 2,
16-
"Minor": 231,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"releaseNotes": "Fixes codesign hangs on a self hosted agent. A Keychain password is now required to use `Default Keychain` or `Custom Keychain`. Microsoft hosted builds should use `Temporary Keychain`.",

‎Tasks/InstallAppleCertificateV2/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 2,
16-
"Minor": 231,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"releaseNotes": "ms-resource:loc.releaseNotes",

‎Tasks/InstallAppleProvisioningProfileV1/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 231,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"runsOn": [

‎Tasks/InstallAppleProvisioningProfileV1/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 231,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"runsOn": [

‎Tasks/InstallSSHKeyV0/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 231,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"runsOn": [

‎Tasks/InstallSSHKeyV0/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 231,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"runsOn": [

‎Tasks/JenkinsQueueJobV2/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"demands": [],
1515
"version": {
1616
"Major": 2,
17-
"Minor": 231,
17+
"Minor": 238,
1818
"Patch": 0
1919
},
2020
"groups": [

‎Tasks/JenkinsQueueJobV2/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"demands": [],
1515
"version": {
1616
"Major": 2,
17-
"Minor": 231,
17+
"Minor": 238,
1818
"Patch": 0
1919
},
2020
"groups": [

‎Tasks/MSBuildV1/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 1,
15-
"Minor": 231,
16-
"Patch": 4
15+
"Minor": 238,
16+
"Patch": 0
1717
},
1818
"demands": [
1919
"msbuild"

‎Tasks/MSBuildV1/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 1,
15-
"Minor": 231,
16-
"Patch": 4
15+
"Minor": 238,
16+
"Patch": 0
1717
},
1818
"demands": [
1919
"msbuild"

‎Tasks/PublishBuildArtifactsV1/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 1,
15-
"Minor": 231,
15+
"Minor": 238,
1616
"Patch": 0
1717
},
1818
"demands": [],

‎Tasks/PublishBuildArtifactsV1/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 1,
15-
"Minor": 231,
15+
"Minor": 238,
1616
"Patch": 0
1717
},
1818
"demands": [],

‎Tasks/SshV0/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 0,
20-
"Minor": 237,
21-
"Patch": 2
20+
"Minor": 238,
21+
"Patch": 0
2222
},
2323
"demands": [],
2424
"minimumAgentVersion": "2.206.1",

‎Tasks/SshV0/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 0,
20-
"Minor": 237,
21-
"Patch": 2
20+
"Minor": 238,
21+
"Patch": 0
2222
},
2323
"demands": [],
2424
"minimumAgentVersion": "2.206.1",

‎Tasks/UseDotNetV2/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 2,
16-
"Minor": 235,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"satisfies": [

‎Tasks/UseDotNetV2/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 2,
16-
"Minor": 235,
16+
"Minor": 238,
1717
"Patch": 0
1818
},
1919
"satisfies": [
@@ -194,4 +194,4 @@
194194
"SupportPhaseNotPresentInChannel": "ms-resource:loc.messages.SupportPhaseNotPresentInChannel",
195195
"DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
196196
}
197-
}
197+
}

‎Tasks/XcodeV5/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 5,
15-
"Minor": 235,
15+
"Minor": 238,
1616
"Patch": 0
1717
},
1818
"releaseNotes": "This version of the task is compatible with Xcode 8 - 13. Features that were solely to maintain compatibility with Xcode 7 have been removed. This task has better options for using Microsoft-hosted macOS agents.",

‎Tasks/XcodeV5/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 5,
15-
"Minor": 235,
15+
"Minor": 238,
1616
"Patch": 0
1717
},
1818
"releaseNotes": "ms-resource:loc.releaseNotes",

‎_generated/DotNetCoreCLIV2.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|2.236.0
2-
Node20_229_2|2.236.1
1+
Default|2.238.0
2+
Node20_229_2|2.238.1

0 commit comments

Comments
 (0)