diff --git a/Tasks/GradleV3/Modules/code-coverage.ts b/Tasks/GradleV3/Modules/code-coverage.ts index d33227dffcc4..619f428fe2c3 100644 --- a/Tasks/GradleV3/Modules/code-coverage.ts +++ b/Tasks/GradleV3/Modules/code-coverage.ts @@ -24,6 +24,8 @@ export function enableCodeCoverageAsync(settings: ICodeCoverageSettings): Q.Prom buildProperties['ismultimodule'] = String(settings.isMultiModule); buildProperties['gradle5xOrHigher'] = String(settings.gradle5xOrHigher); buildProperties['gradleVersion'] = settings.gradleVersion; + buildProperties['useJacocoTemplateV2forSingleModule'] = String(settings.useJacocoTemplateV2forSingleModule); + buildProperties['useJacocoTemplateV2forMultiModule'] = String(settings.useJacocoTemplateV2forMultiModule); const codeCoverageEnabler: ICodeCoverageEnabler = new CodeCoverageEnablerFactory().getTool('gradle', settings.codeCoverageTool.toLowerCase()); return codeCoverageEnabler.enableCodeCoverage(buildProperties); diff --git a/Tasks/GradleV3/_buildConfigs/Node20/package-lock.json b/Tasks/GradleV3/_buildConfigs/Node20/package-lock.json index 8c881e039c74..c4cd9e9e7f75 100644 --- a/Tasks/GradleV3/_buildConfigs/Node20/package-lock.json +++ b/Tasks/GradleV3/_buildConfigs/Node20/package-lock.json @@ -13,7 +13,7 @@ "@types/node": "^20.3.1", "azure-pipelines-task-lib": "^4.16.0", "azure-pipelines-tasks-codeanalysis-common": "^2.242.0", - "azure-pipelines-tasks-codecoverage-tools": "^3.242.0", + "azure-pipelines-tasks-codecoverage-tools": "^3.245.1", "azure-pipelines-tasks-java-common": "^2.219.1", "azure-pipelines-tasks-utility-common": "^3.241.0" }, @@ -369,9 +369,10 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/azure-pipelines-task-lib": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.16.0.tgz", - "integrity": "sha512-hjyDi5GI1cFmS2o6GzTFPqloeTZBeaTLOjPn/H3CVr0vV/MV+eYoWszVe9kn7XnRSiv22j3p4Rhw/Sy4v1okxA==", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.17.2.tgz", + "integrity": "sha512-kKG1I2cpHM0kqn/YlnZiA2J59/x4OraEZZ1/Cp6A7XOu0e+E1PfrfldVVOU/tdeW/xOFoexqA4EEV27LfH0YqQ==", + "license": "MIT", "dependencies": { "adm-zip": "^0.5.10", "minimatch": "3.0.5", @@ -433,19 +434,21 @@ } }, "node_modules/azure-pipelines-tasks-codecoverage-tools": { - "version": "3.242.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.242.0.tgz", - "integrity": "sha512-sjDieiJWDlY1gCZf/KHL1/1SvJ7E2qLa7tt2d3wLgJh2TnbSr2losShAE2wBY4qeB90jeDzZa5sDX/mrvc4U0Q==", + "version": "3.245.1", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.245.1.tgz", + "integrity": "sha512-60cEkswIBOplBRS6D5OkqcddCmaabbRLmBEWXWV+DHHX7oP+RrHAvmrViXUqdILbe+DgsINrG7Bb++dOciMjSQ==", + "license": "MIT", "dependencies": { "@types/cheerio": "0.22.0", "@types/node": "^10.17.0", "@types/q": "^1.5.4", - "azure-pipelines-task-lib": "^3.1.0", + "azure-pipelines-task-lib": "^4.17.0", "cheerio": "1.0.0-rc.6", "fs-extra": "^0.30.0", "mocha": "^10.5.1", "os": "^0.1.1", "rewire": "^6.0.0", + "semver": "^7.5.4", "sinon": "^14.0.0", "strip-bom": "^3.0.0", "xml2js": "^0.6.2" @@ -456,18 +459,16 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" }, - "node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/azure-pipelines-task-lib": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-3.4.0.tgz", - "integrity": "sha512-3eC4OTFw+7xD7A2aUhxR/j+jRlTI+vVfS0CGxt1pCLs4c/KmY0tQWgbqjD3157kmiucWxELBvgZHaD2gCBe9fg==", - "dependencies": { - "minimatch": "3.0.5", - "mockery": "^2.1.0", - "q": "^1.5.1", - "semver": "^5.1.0", - "shelljs": "^0.8.5", - "sync-request": "6.1.0", - "uuid": "^3.0.1" + "node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/azure-pipelines-tasks-java-common": { diff --git a/Tasks/GradleV3/_buildConfigs/Node20/package.json b/Tasks/GradleV3/_buildConfigs/Node20/package.json index 332add1fe9d0..da03d99e7d49 100644 --- a/Tasks/GradleV3/_buildConfigs/Node20/package.json +++ b/Tasks/GradleV3/_buildConfigs/Node20/package.json @@ -12,7 +12,7 @@ "@types/node": "^20.3.1", "azure-pipelines-task-lib": "^4.16.0", "azure-pipelines-tasks-codeanalysis-common": "^2.242.0", - "azure-pipelines-tasks-codecoverage-tools": "^3.242.0", + "azure-pipelines-tasks-codecoverage-tools": "^3.245.1", "azure-pipelines-tasks-java-common": "^2.219.1", "azure-pipelines-tasks-utility-common": "^3.241.0" }, diff --git a/Tasks/GradleV3/gradletask.ts b/Tasks/GradleV3/gradletask.ts index 5a14fe68c2f6..bd62b249c510 100644 --- a/Tasks/GradleV3/gradletask.ts +++ b/Tasks/GradleV3/gradletask.ts @@ -82,6 +82,13 @@ async function run() { // Clean the report directory before enabling code coverage tl.rmRF(reportDirectory); + const useJacocoTemplateV2forSingleModule = tl.getPipelineFeature('useJacocoTemplateV2forSingleModule'); + const useJacocoTemplateV2forMultiModule = tl.getPipelineFeature('useJacocoTemplateV2forMultiModule'); + + // Print the status of useJacocoTemplateV2forSingleModule and useJacocoTemplateV2forMultiModule feature flags + console.log(`useJacocoTemplateV2forSingleModule: ${useJacocoTemplateV2forSingleModule}`); + console.log(`useJacocoTemplateV2forMultiModule: ${useJacocoTemplateV2forMultiModule}`); + const codeCoverageSettings: ICodeCoverageSettings = { wrapperScript: wrapperScript, isCodeCoverageOpted: isCodeCoverageOpted, @@ -93,7 +100,9 @@ async function run() { summaryFileName: codeCoveragePreset.summaryFileName, isMultiModule: isMultiModule, gradle5xOrHigher: gradle5xOrHigher, - gradleVersion: gradleVersion + gradleVersion: gradleVersion, + useJacocoTemplateV2forSingleModule: useJacocoTemplateV2forSingleModule, + useJacocoTemplateV2forMultiModule: useJacocoTemplateV2forMultiModule }; emitTelemetry('TaskHub', 'GradleV3', { codeCoverageSettings: codeCoverageSettings }); diff --git a/Tasks/GradleV3/interfaces.ts b/Tasks/GradleV3/interfaces.ts index a442e7da5437..4e281cb6adf5 100644 --- a/Tasks/GradleV3/interfaces.ts +++ b/Tasks/GradleV3/interfaces.ts @@ -17,6 +17,8 @@ export interface ICodeCoverageSettings { isMultiModule: boolean; gradle5xOrHigher: boolean; gradleVersion: string; + useJacocoTemplateV2forSingleModule: boolean; + useJacocoTemplateV2forMultiModule: boolean; } export interface IPublishCodeCoverageSettings { diff --git a/Tasks/GradleV3/package-lock.json b/Tasks/GradleV3/package-lock.json index b57b29419f37..53da61529c9f 100644 --- a/Tasks/GradleV3/package-lock.json +++ b/Tasks/GradleV3/package-lock.json @@ -365,19 +365,20 @@ } }, "azure-pipelines-tasks-codecoverage-tools": { - "version": "3.242.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.242.0.tgz", - "integrity": "sha512-sjDieiJWDlY1gCZf/KHL1/1SvJ7E2qLa7tt2d3wLgJh2TnbSr2losShAE2wBY4qeB90jeDzZa5sDX/mrvc4U0Q==", + "version": "3.245.1", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.245.1.tgz", + "integrity": "sha512-60cEkswIBOplBRS6D5OkqcddCmaabbRLmBEWXWV+DHHX7oP+RrHAvmrViXUqdILbe+DgsINrG7Bb++dOciMjSQ==", "requires": { "@types/cheerio": "0.22.0", "@types/node": "^10.17.0", "@types/q": "^1.5.4", - "azure-pipelines-task-lib": "^3.1.0", + "azure-pipelines-task-lib": "^4.17.0", "cheerio": "1.0.0-rc.6", "fs-extra": "^0.30.0", "mocha": "^10.5.1", "os": "^0.1.1", "rewire": "^6.0.0", + "semver": "^7.5.4", "sinon": "^14.0.0", "strip-bom": "^3.0.0", "xml2js": "^0.6.2" @@ -389,18 +390,30 @@ "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" }, "azure-pipelines-task-lib": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-3.4.0.tgz", - "integrity": "sha512-3eC4OTFw+7xD7A2aUhxR/j+jRlTI+vVfS0CGxt1pCLs4c/KmY0tQWgbqjD3157kmiucWxELBvgZHaD2gCBe9fg==", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.17.2.tgz", + "integrity": "sha512-kKG1I2cpHM0kqn/YlnZiA2J59/x4OraEZZ1/Cp6A7XOu0e+E1PfrfldVVOU/tdeW/xOFoexqA4EEV27LfH0YqQ==", "requires": { + "adm-zip": "^0.5.10", "minimatch": "3.0.5", - "mockery": "^2.1.0", + "nodejs-file-downloader": "^4.11.1", "q": "^1.5.1", - "semver": "^5.1.0", + "semver": "^5.7.2", "shelljs": "^0.8.5", - "sync-request": "6.1.0", "uuid": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" + } } + }, + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" } } }, diff --git a/Tasks/GradleV3/package.json b/Tasks/GradleV3/package.json index 525c5d7ca29e..5c12899ae3de 100644 --- a/Tasks/GradleV3/package.json +++ b/Tasks/GradleV3/package.json @@ -12,7 +12,7 @@ "@types/node": "^16.11.39", "azure-pipelines-task-lib": "^4.16.0", "azure-pipelines-tasks-codeanalysis-common": "^2.242.0", - "azure-pipelines-tasks-codecoverage-tools": "^3.242.0", + "azure-pipelines-tasks-codecoverage-tools": "^3.245.1", "azure-pipelines-tasks-java-common": "^2.219.1", "azure-pipelines-tasks-utility-common": "^3.241.0" }, diff --git a/Tasks/GradleV3/task.json b/Tasks/GradleV3/task.json index 5db032237114..2432dd3aaef2 100644 --- a/Tasks/GradleV3/task.json +++ b/Tasks/GradleV3/task.json @@ -17,7 +17,7 @@ "version": { "Major": 3, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "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`", "demands": [], diff --git a/Tasks/GradleV3/task.loc.json b/Tasks/GradleV3/task.loc.json index 134ac68e2782..9571f0b3dd20 100644 --- a/Tasks/GradleV3/task.loc.json +++ b/Tasks/GradleV3/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 3, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [], diff --git a/_generated/GradleV3.versionmap.txt b/_generated/GradleV3.versionmap.txt index d8b1d10c8abc..ad593c870567 100644 --- a/_generated/GradleV3.versionmap.txt +++ b/_generated/GradleV3.versionmap.txt @@ -1,2 +1,2 @@ -Default|3.246.0 -Node20_229_2|3.246.1 +Default|3.246.2 +Node20_229_2|3.246.3 diff --git a/_generated/GradleV3/Modules/code-coverage.ts b/_generated/GradleV3/Modules/code-coverage.ts index d33227dffcc4..619f428fe2c3 100644 --- a/_generated/GradleV3/Modules/code-coverage.ts +++ b/_generated/GradleV3/Modules/code-coverage.ts @@ -24,6 +24,8 @@ export function enableCodeCoverageAsync(settings: ICodeCoverageSettings): Q.Prom buildProperties['ismultimodule'] = String(settings.isMultiModule); buildProperties['gradle5xOrHigher'] = String(settings.gradle5xOrHigher); buildProperties['gradleVersion'] = settings.gradleVersion; + buildProperties['useJacocoTemplateV2forSingleModule'] = String(settings.useJacocoTemplateV2forSingleModule); + buildProperties['useJacocoTemplateV2forMultiModule'] = String(settings.useJacocoTemplateV2forMultiModule); const codeCoverageEnabler: ICodeCoverageEnabler = new CodeCoverageEnablerFactory().getTool('gradle', settings.codeCoverageTool.toLowerCase()); return codeCoverageEnabler.enableCodeCoverage(buildProperties); diff --git a/_generated/GradleV3/gradletask.ts b/_generated/GradleV3/gradletask.ts index 5a14fe68c2f6..bd62b249c510 100644 --- a/_generated/GradleV3/gradletask.ts +++ b/_generated/GradleV3/gradletask.ts @@ -82,6 +82,13 @@ async function run() { // Clean the report directory before enabling code coverage tl.rmRF(reportDirectory); + const useJacocoTemplateV2forSingleModule = tl.getPipelineFeature('useJacocoTemplateV2forSingleModule'); + const useJacocoTemplateV2forMultiModule = tl.getPipelineFeature('useJacocoTemplateV2forMultiModule'); + + // Print the status of useJacocoTemplateV2forSingleModule and useJacocoTemplateV2forMultiModule feature flags + console.log(`useJacocoTemplateV2forSingleModule: ${useJacocoTemplateV2forSingleModule}`); + console.log(`useJacocoTemplateV2forMultiModule: ${useJacocoTemplateV2forMultiModule}`); + const codeCoverageSettings: ICodeCoverageSettings = { wrapperScript: wrapperScript, isCodeCoverageOpted: isCodeCoverageOpted, @@ -93,7 +100,9 @@ async function run() { summaryFileName: codeCoveragePreset.summaryFileName, isMultiModule: isMultiModule, gradle5xOrHigher: gradle5xOrHigher, - gradleVersion: gradleVersion + gradleVersion: gradleVersion, + useJacocoTemplateV2forSingleModule: useJacocoTemplateV2forSingleModule, + useJacocoTemplateV2forMultiModule: useJacocoTemplateV2forMultiModule }; emitTelemetry('TaskHub', 'GradleV3', { codeCoverageSettings: codeCoverageSettings }); diff --git a/_generated/GradleV3/interfaces.ts b/_generated/GradleV3/interfaces.ts index a442e7da5437..4e281cb6adf5 100644 --- a/_generated/GradleV3/interfaces.ts +++ b/_generated/GradleV3/interfaces.ts @@ -17,6 +17,8 @@ export interface ICodeCoverageSettings { isMultiModule: boolean; gradle5xOrHigher: boolean; gradleVersion: string; + useJacocoTemplateV2forSingleModule: boolean; + useJacocoTemplateV2forMultiModule: boolean; } export interface IPublishCodeCoverageSettings { diff --git a/_generated/GradleV3/package-lock.json b/_generated/GradleV3/package-lock.json index b57b29419f37..53da61529c9f 100644 --- a/_generated/GradleV3/package-lock.json +++ b/_generated/GradleV3/package-lock.json @@ -365,19 +365,20 @@ } }, "azure-pipelines-tasks-codecoverage-tools": { - "version": "3.242.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.242.0.tgz", - "integrity": "sha512-sjDieiJWDlY1gCZf/KHL1/1SvJ7E2qLa7tt2d3wLgJh2TnbSr2losShAE2wBY4qeB90jeDzZa5sDX/mrvc4U0Q==", + "version": "3.245.1", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.245.1.tgz", + "integrity": "sha512-60cEkswIBOplBRS6D5OkqcddCmaabbRLmBEWXWV+DHHX7oP+RrHAvmrViXUqdILbe+DgsINrG7Bb++dOciMjSQ==", "requires": { "@types/cheerio": "0.22.0", "@types/node": "^10.17.0", "@types/q": "^1.5.4", - "azure-pipelines-task-lib": "^3.1.0", + "azure-pipelines-task-lib": "^4.17.0", "cheerio": "1.0.0-rc.6", "fs-extra": "^0.30.0", "mocha": "^10.5.1", "os": "^0.1.1", "rewire": "^6.0.0", + "semver": "^7.5.4", "sinon": "^14.0.0", "strip-bom": "^3.0.0", "xml2js": "^0.6.2" @@ -389,18 +390,30 @@ "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" }, "azure-pipelines-task-lib": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-3.4.0.tgz", - "integrity": "sha512-3eC4OTFw+7xD7A2aUhxR/j+jRlTI+vVfS0CGxt1pCLs4c/KmY0tQWgbqjD3157kmiucWxELBvgZHaD2gCBe9fg==", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.17.2.tgz", + "integrity": "sha512-kKG1I2cpHM0kqn/YlnZiA2J59/x4OraEZZ1/Cp6A7XOu0e+E1PfrfldVVOU/tdeW/xOFoexqA4EEV27LfH0YqQ==", "requires": { + "adm-zip": "^0.5.10", "minimatch": "3.0.5", - "mockery": "^2.1.0", + "nodejs-file-downloader": "^4.11.1", "q": "^1.5.1", - "semver": "^5.1.0", + "semver": "^5.7.2", "shelljs": "^0.8.5", - "sync-request": "6.1.0", "uuid": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" + } } + }, + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" } } }, diff --git a/_generated/GradleV3/package.json b/_generated/GradleV3/package.json index 525c5d7ca29e..5c12899ae3de 100644 --- a/_generated/GradleV3/package.json +++ b/_generated/GradleV3/package.json @@ -12,7 +12,7 @@ "@types/node": "^16.11.39", "azure-pipelines-task-lib": "^4.16.0", "azure-pipelines-tasks-codeanalysis-common": "^2.242.0", - "azure-pipelines-tasks-codecoverage-tools": "^3.242.0", + "azure-pipelines-tasks-codecoverage-tools": "^3.245.1", "azure-pipelines-tasks-java-common": "^2.219.1", "azure-pipelines-tasks-utility-common": "^3.241.0" }, diff --git a/_generated/GradleV3/task.json b/_generated/GradleV3/task.json index 0e5792e0e53d..66f4126bf621 100644 --- a/_generated/GradleV3/task.json +++ b/_generated/GradleV3/task.json @@ -17,7 +17,7 @@ "version": { "Major": 3, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "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`", "demands": [], @@ -427,7 +427,7 @@ "UnableToExtractGradleVersion": "Unable to extract Gradle version from gradle output." }, "_buildConfigMapping": { - "Default": "3.246.0", - "Node20_229_2": "3.246.1" + "Default": "3.246.2", + "Node20_229_2": "3.246.3" } } \ No newline at end of file diff --git a/_generated/GradleV3/task.loc.json b/_generated/GradleV3/task.loc.json index 8490ddb32b36..b206676f1180 100644 --- a/_generated/GradleV3/task.loc.json +++ b/_generated/GradleV3/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 3, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [], @@ -427,7 +427,7 @@ "UnableToExtractGradleVersion": "ms-resource:loc.messages.UnableToExtractGradleVersion" }, "_buildConfigMapping": { - "Default": "3.246.0", - "Node20_229_2": "3.246.1" + "Default": "3.246.2", + "Node20_229_2": "3.246.3" } } \ No newline at end of file diff --git a/_generated/GradleV3_Node20/Modules/code-coverage.ts b/_generated/GradleV3_Node20/Modules/code-coverage.ts index d33227dffcc4..619f428fe2c3 100644 --- a/_generated/GradleV3_Node20/Modules/code-coverage.ts +++ b/_generated/GradleV3_Node20/Modules/code-coverage.ts @@ -24,6 +24,8 @@ export function enableCodeCoverageAsync(settings: ICodeCoverageSettings): Q.Prom buildProperties['ismultimodule'] = String(settings.isMultiModule); buildProperties['gradle5xOrHigher'] = String(settings.gradle5xOrHigher); buildProperties['gradleVersion'] = settings.gradleVersion; + buildProperties['useJacocoTemplateV2forSingleModule'] = String(settings.useJacocoTemplateV2forSingleModule); + buildProperties['useJacocoTemplateV2forMultiModule'] = String(settings.useJacocoTemplateV2forMultiModule); const codeCoverageEnabler: ICodeCoverageEnabler = new CodeCoverageEnablerFactory().getTool('gradle', settings.codeCoverageTool.toLowerCase()); return codeCoverageEnabler.enableCodeCoverage(buildProperties); diff --git a/_generated/GradleV3_Node20/gradletask.ts b/_generated/GradleV3_Node20/gradletask.ts index 5a14fe68c2f6..bd62b249c510 100644 --- a/_generated/GradleV3_Node20/gradletask.ts +++ b/_generated/GradleV3_Node20/gradletask.ts @@ -82,6 +82,13 @@ async function run() { // Clean the report directory before enabling code coverage tl.rmRF(reportDirectory); + const useJacocoTemplateV2forSingleModule = tl.getPipelineFeature('useJacocoTemplateV2forSingleModule'); + const useJacocoTemplateV2forMultiModule = tl.getPipelineFeature('useJacocoTemplateV2forMultiModule'); + + // Print the status of useJacocoTemplateV2forSingleModule and useJacocoTemplateV2forMultiModule feature flags + console.log(`useJacocoTemplateV2forSingleModule: ${useJacocoTemplateV2forSingleModule}`); + console.log(`useJacocoTemplateV2forMultiModule: ${useJacocoTemplateV2forMultiModule}`); + const codeCoverageSettings: ICodeCoverageSettings = { wrapperScript: wrapperScript, isCodeCoverageOpted: isCodeCoverageOpted, @@ -93,7 +100,9 @@ async function run() { summaryFileName: codeCoveragePreset.summaryFileName, isMultiModule: isMultiModule, gradle5xOrHigher: gradle5xOrHigher, - gradleVersion: gradleVersion + gradleVersion: gradleVersion, + useJacocoTemplateV2forSingleModule: useJacocoTemplateV2forSingleModule, + useJacocoTemplateV2forMultiModule: useJacocoTemplateV2forMultiModule }; emitTelemetry('TaskHub', 'GradleV3', { codeCoverageSettings: codeCoverageSettings }); diff --git a/_generated/GradleV3_Node20/interfaces.ts b/_generated/GradleV3_Node20/interfaces.ts index a442e7da5437..4e281cb6adf5 100644 --- a/_generated/GradleV3_Node20/interfaces.ts +++ b/_generated/GradleV3_Node20/interfaces.ts @@ -17,6 +17,8 @@ export interface ICodeCoverageSettings { isMultiModule: boolean; gradle5xOrHigher: boolean; gradleVersion: string; + useJacocoTemplateV2forSingleModule: boolean; + useJacocoTemplateV2forMultiModule: boolean; } export interface IPublishCodeCoverageSettings { diff --git a/_generated/GradleV3_Node20/package-lock.json b/_generated/GradleV3_Node20/package-lock.json index 8c881e039c74..c4cd9e9e7f75 100644 --- a/_generated/GradleV3_Node20/package-lock.json +++ b/_generated/GradleV3_Node20/package-lock.json @@ -13,7 +13,7 @@ "@types/node": "^20.3.1", "azure-pipelines-task-lib": "^4.16.0", "azure-pipelines-tasks-codeanalysis-common": "^2.242.0", - "azure-pipelines-tasks-codecoverage-tools": "^3.242.0", + "azure-pipelines-tasks-codecoverage-tools": "^3.245.1", "azure-pipelines-tasks-java-common": "^2.219.1", "azure-pipelines-tasks-utility-common": "^3.241.0" }, @@ -369,9 +369,10 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/azure-pipelines-task-lib": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.16.0.tgz", - "integrity": "sha512-hjyDi5GI1cFmS2o6GzTFPqloeTZBeaTLOjPn/H3CVr0vV/MV+eYoWszVe9kn7XnRSiv22j3p4Rhw/Sy4v1okxA==", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.17.2.tgz", + "integrity": "sha512-kKG1I2cpHM0kqn/YlnZiA2J59/x4OraEZZ1/Cp6A7XOu0e+E1PfrfldVVOU/tdeW/xOFoexqA4EEV27LfH0YqQ==", + "license": "MIT", "dependencies": { "adm-zip": "^0.5.10", "minimatch": "3.0.5", @@ -433,19 +434,21 @@ } }, "node_modules/azure-pipelines-tasks-codecoverage-tools": { - "version": "3.242.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.242.0.tgz", - "integrity": "sha512-sjDieiJWDlY1gCZf/KHL1/1SvJ7E2qLa7tt2d3wLgJh2TnbSr2losShAE2wBY4qeB90jeDzZa5sDX/mrvc4U0Q==", + "version": "3.245.1", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-codecoverage-tools/-/azure-pipelines-tasks-codecoverage-tools-3.245.1.tgz", + "integrity": "sha512-60cEkswIBOplBRS6D5OkqcddCmaabbRLmBEWXWV+DHHX7oP+RrHAvmrViXUqdILbe+DgsINrG7Bb++dOciMjSQ==", + "license": "MIT", "dependencies": { "@types/cheerio": "0.22.0", "@types/node": "^10.17.0", "@types/q": "^1.5.4", - "azure-pipelines-task-lib": "^3.1.0", + "azure-pipelines-task-lib": "^4.17.0", "cheerio": "1.0.0-rc.6", "fs-extra": "^0.30.0", "mocha": "^10.5.1", "os": "^0.1.1", "rewire": "^6.0.0", + "semver": "^7.5.4", "sinon": "^14.0.0", "strip-bom": "^3.0.0", "xml2js": "^0.6.2" @@ -456,18 +459,16 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" }, - "node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/azure-pipelines-task-lib": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-3.4.0.tgz", - "integrity": "sha512-3eC4OTFw+7xD7A2aUhxR/j+jRlTI+vVfS0CGxt1pCLs4c/KmY0tQWgbqjD3157kmiucWxELBvgZHaD2gCBe9fg==", - "dependencies": { - "minimatch": "3.0.5", - "mockery": "^2.1.0", - "q": "^1.5.1", - "semver": "^5.1.0", - "shelljs": "^0.8.5", - "sync-request": "6.1.0", - "uuid": "^3.0.1" + "node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/azure-pipelines-tasks-java-common": { diff --git a/_generated/GradleV3_Node20/package.json b/_generated/GradleV3_Node20/package.json index 332add1fe9d0..da03d99e7d49 100644 --- a/_generated/GradleV3_Node20/package.json +++ b/_generated/GradleV3_Node20/package.json @@ -12,7 +12,7 @@ "@types/node": "^20.3.1", "azure-pipelines-task-lib": "^4.16.0", "azure-pipelines-tasks-codeanalysis-common": "^2.242.0", - "azure-pipelines-tasks-codecoverage-tools": "^3.242.0", + "azure-pipelines-tasks-codecoverage-tools": "^3.245.1", "azure-pipelines-tasks-java-common": "^2.219.1", "azure-pipelines-tasks-utility-common": "^3.241.0" }, diff --git a/_generated/GradleV3_Node20/task.json b/_generated/GradleV3_Node20/task.json index 0c1c28d98b03..7f235f58719b 100644 --- a/_generated/GradleV3_Node20/task.json +++ b/_generated/GradleV3_Node20/task.json @@ -17,7 +17,7 @@ "version": { "Major": 3, "Minor": 246, - "Patch": 1 + "Patch": 3 }, "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`", "demands": [], @@ -431,7 +431,7 @@ "UnableToExtractGradleVersion": "Unable to extract Gradle version from gradle output." }, "_buildConfigMapping": { - "Default": "3.246.0", - "Node20_229_2": "3.246.1" + "Default": "3.246.2", + "Node20_229_2": "3.246.3" } } \ No newline at end of file diff --git a/_generated/GradleV3_Node20/task.loc.json b/_generated/GradleV3_Node20/task.loc.json index b184df4115ed..cffc1500eedb 100644 --- a/_generated/GradleV3_Node20/task.loc.json +++ b/_generated/GradleV3_Node20/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 3, "Minor": 246, - "Patch": 1 + "Patch": 3 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [], @@ -431,7 +431,7 @@ "UnableToExtractGradleVersion": "ms-resource:loc.messages.UnableToExtractGradleVersion" }, "_buildConfigMapping": { - "Default": "3.246.0", - "Node20_229_2": "3.246.1" + "Default": "3.246.2", + "Node20_229_2": "3.246.3" } } \ No newline at end of file