restore 7zip-bin

microsoft · Jun 11, 2024 · 8fc74b8 · 8fc74b8
1 parent a3f2177
commit 8fc74b8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/BuildTasks/PublishExtension/v5/package-lock.json b/BuildTasks/PublishExtension/v5/package-lock.json
diff --git a/BuildTasks/PublishExtension/v5/package.json b/BuildTasks/PublishExtension/v5/package.json
@@ -9,7 +9,7 @@
   "type": "module",
   "license": "MIT",
   "dependencies": {
-    "7zip-bin-win": "^2.2.0",
+    "7zip-bin": "^5.2.0",
     "azure-pipelines-task-lib": "^4.13.0",
     "azure-pipelines-tasks-azure-arm-rest": "^3.239.0",
     "fs-extra": "^11.2.0",

diff --git a/BuildTasks/PublishExtension/v5/vsixeditor.ts b/BuildTasks/PublishExtension/v5/vsixeditor.ts
@@ -126,7 +126,7 @@ export default class VSIXEditor {
         const cwd = tl.cwd();
 
         if (tl.getPlatform() === tl.Platform.Windows) {
-            const sevenZip = await require("7zip-bin-win");
+            const sevenZip = await import ("7zip-bin");
             const zip = new tr.ToolRunner(sevenZip.path7za);
 
             zip.arg("x");
@@ -166,7 +166,7 @@ export default class VSIXEditor {
         if (originalVsix !== targetVsix) { tl.cp(originalVsix, targetVsix, "-f"); }
 
         if (tl.getPlatform() === tl.Platform.Windows) {
-            const sevenZip = await require("7zip-bin-win");
+            const sevenZip = await import ("7zip-bin");
             const zip = new tr.ToolRunner(sevenZip.path7za);
 
             zip.arg("u");

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -64,6 +64,8 @@ stages:
         customCommand: 'run package'
 
     - pwsh: |
+        del BuildTasks\PublishExtension\v5\node_modules\7zip-bin\linux -recurse
+        del BuildTasks\PublishExtension\v5\node_modules\7zip-bin\mac -recurse
         del BuildTasks\*\v*\package-lock.json
         del BuildTasks\*\v*\*.ts
         del BuildTasks\*\v*\tsconfig.json