From 6fa197d0d1b6db8dcc3a6bc8c3cb4505cc870cfb Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Fri, 10 Apr 2020 19:33:31 +0200
Subject: [PATCH] Misc appveyor zip changes

---
 appveyor.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7ab4e00fa..541a078d6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -146,10 +146,8 @@ after_test:
         Set-Location "$env:APPVEYOR_BUILD_FOLDER"
 
         if ($variant -like '*-netf') {
-            $compressionMethod = 'Deflate' # This depends on what ZipArchive supports on given platform
             $targetFramework = $env:NET_FRAMEWORK_VERSION
         } else {
-            $compressionMethod = 'Deflate64' # This depends on what ZipArchive supports on given platform
             $targetFramework = $env:NET_CORE_VERSION
         }
 
@@ -189,17 +187,11 @@ after_test:
 
             # If this build is going to be deployed further, prefer maximum compression
             if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq 'Visual Studio 2019') {
-                $compressionArgs = '-mx=9', '-mpass=15'
-
-                if ($compressionMethod -eq 'Deflate64') {
-                    $compressionArgs += '-mfb=257'
-                } else {
-                    $compressionArgs += '-mfb=258'
-                }
+                $compressionArgs = '-mx=9', '-mfb=258', '-mpass=15'
             }
         }
 
-        7z a -bd -tzip "-mm=$compressionMethod" $compressionArgs "out\ASF-$variant.zip" "$env:APPVEYOR_BUILD_FOLDER\out\$variant\*"
+        7z a -bd -slp -tzip -mm=Deflate $compressionArgs "out\ASF-$variant.zip" "$env:APPVEYOR_BUILD_FOLDER\out\$variant\*"
 
         if ($LastExitCode -ne 0) {
             throw "Last command failed."