Skip to content

Commit 6a37f0e

Browse files
authored
Updating 7zip version to 25.01 in Utility common and webdeployment pacakge (#505)
* Updating 7zip version to 25.01 * Removed older version and added 2409 as default version
1 parent 626b27c commit 6a37f0e

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

common-npm-packages/utility-common/compressutility.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ var xpSevenZipLocation: string;
1414
var winSevenZipLocation: string = getWinSevenZipLocation();
1515

1616
function getWinSevenZipLocation(): string {
17-
if (tl.getPipelineFeature("Use7zV2409InUtilityCommonPackage")) {
17+
if (tl.getPipelineFeature("Use7zV2501InUtilityCommonPackage")) {
18+
return path.join(__dirname, 'tools/7zip25/7z.exe');
19+
}
20+
else {
1821
return path.join(__dirname, 'tools/7zip24/7z.exe');
19-
} else {
20-
return path.join(__dirname, 'tools/7zip5/7z.exe');
2122
}
2223
}
2324

common-npm-packages/utility-common/make.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const buildPath = './_build';
88
const toolPath = './tools';
99

1010
const zipUrls = {
11-
'7zip5': 'https://vstsagenttools.blob.core.windows.net/tools/7zip/5/7zip.zip',
12-
'7zip24': 'https://vstsagenttools.blob.core.windows.net/tools/7zip/24.09/7zip.zip'
11+
'7zip24': 'https://vstsagenttools.blob.core.windows.net/tools/7zip/24.09/7zip.zip',
12+
'7zip25': 'https://vstsagenttools.blob.core.windows.net/tools/7zip/25.01/7zip.zip'
1313
};
1414

1515
for (const [version, url] of Object.entries(zipUrls)) {

common-npm-packages/utility-common/package-lock.json

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

common-npm-packages/utility-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "azure-pipelines-tasks-utility-common",
3-
"version": "3.265.0",
3+
"version": "3.265.1",
44
"description": "Common Library for Azure Rest Calls",
55
"repository": {
66
"type": "git",

common-npm-packages/webdeployment-common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/7zip/5/7zip.zip ./7zip
21
node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/7zip/24.09/7zip.zip ./7zip24
2+
node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/7zip/25.01/7zip.zip ./7zip25
33
node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/MSDeploy/3.6/M142/MSDeploy.zip ./MSDeploy/M142
44
node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/MSDeploy/3.6/M229/MSDeploy.zip ./MSDeploy/M229
55
node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/ctt/1.6/ctt.zip ./ctt

common-npm-packages/webdeployment-common/make.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ util.run(path.join(__dirname, 'node_modules/.bin/tsc') + ' --outDir ' + buildPat
99
util.cp(path.join(__dirname, 'package.json'), buildPath);
1010
util.cp(path.join(__dirname, 'package-lock.json'), buildPath);
1111
util.cp(path.join(__dirname, 'module.json'), buildPath);
12-
util.cp('-r', '7zip', buildPath);
1312
util.cp('-r', '7zip24', buildPath);
13+
util.cp('-r', '7zip25', buildPath);
1414
util.cp('-r', 'ctt', buildPath);
1515
util.cp('-r', 'MSDeploy', buildPath);
1616
util.cp('-r', 'node_modules', buildPath);

common-npm-packages/webdeployment-common/package-lock.json

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

common-npm-packages/webdeployment-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "azure-pipelines-tasks-webdeployment-common",
3-
"version": "4.260.0",
3+
"version": "4.265.0",
44
"description": "Common Lib for MSDeploy Utility",
55
"repository": {
66
"type": "git",

common-npm-packages/webdeployment-common/ziputility.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ const extractUsingPowerShell = async (fromFile: string, toDir: string) => {
8989
const extractUsing7zip = async (fromFile: string, toDir: string) => {
9090
let win7zipLocation: string;
9191

92-
if (tl.getPipelineFeature("Use7zV2409InWebDeploymentCommonPackage")) {
93-
win7zipLocation = path.join(__dirname, '7zip24/7zip/7z.exe');
94-
} else {
95-
win7zipLocation = path.join(__dirname, '7zip/7zip/7z.exe');
92+
if (tl.getPipelineFeature("Use7zV2501InWebDeploymentCommonPackage")) {
93+
win7zipLocation = path.join(__dirname, '7zip25/7zip/7z.exe');
94+
}
95+
else{
96+
win7zipLocation = path.join(__dirname, '7zip24/7zip/7z.exe');
9697
}
9798

9899
tl.debug(`Using 7zip tool from ${win7zipLocation} for extracting`);

0 commit comments

Comments
 (0)