switch unzip to 7zip for windows

3 files changed, 12 insertions, 8 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index d2ee2b0bb..ad64f604b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -21,16 +21,17 @@ install:
   - ps: Expand-Archive ./nsis-longstr.zip -DestinationPath ./nsis -Force
   - ps: Expand-Archive ./nsis-uac.zip -DestinationPath ./nsis -Force
   - ps: Move-Item ./nsis/UAC.nsh ./nsis/Include/
-  # unzip
-  - ps: Invoke-WebRequest "https://github.com/xmake-mirror/gnuwin32-unzip/releases/download/5.51.1/unzip-5.51-1-bin.zip" -UseBasicParsing -OutFile .\unzip.zip
-  - ps: Expand-Archive ./unzip.zip -DestinationPath ./unzip
-  - ps: Copy-Item ./unzip/bin/unzip.exe ./winenv/bin
+  # 7zip
+  - ps: Invoke-WebRequest "https://github.com/xmake-mirror/7zip/releases/download/19.00/7z19.00-$($env:platform).zip" -UseBasicParsing -OutFile .\7zip.zip
+  - ps: Expand-Archive ./7zip.zip -DestinationPath ./7zip
+  - ps: Copy-Item ./7zip/bin/7z.exe ./winenv/bin
+  - ps: Copy-Item ./7zip/bin/7z.dll ./winenv/bin
   # curl
   - ps: Invoke-WebRequest "https://github.com/xmake-io/xmake-win$(if ($env:platform -eq 'x64') { '64' } else { '32' })env/raw/master/bin/curl.exe" -UseBasicParsing -OutFile .\curl.exe
   - ps: Invoke-WebRequest "https://raw.githubusercontent.com/xmake-io/xmake-win$(if ($env:platform -eq 'x64') { '64' } else { '32' })env/master/bin/curl-ca-bundle.crt" -UseBasicParsing -OutFile .\curl-ca-bundle.crt
   - ps: Copy-Item ./curl.exe ./winenv/bin
   - ps: Copy-Item ./curl-ca-bundle.crt ./winenv/bin
-  # 
+  #
   - ps: Pop-Location
   # install xmake
   - ps: git submodule -q update --init --recursive
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0a54dfa37..9fdbd5df7 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -72,9 +72,10 @@ jobs:
         run: |
           # build installer
           (New-Item ./winenv/bin -ItemType Directory).FullName
-          Invoke-WebRequest "https://github.com/xmake-mirror/gnuwin32-unzip/releases/download/5.51.1/unzip-5.51-1-bin.zip" -UseBasicParsing -OutFile .\unzip.zip
-          Expand-Archive ./unzip.zip -DestinationPath ./unzip
-          Copy-Item ./unzip/bin/unzip.exe ./winenv/bin
+          Invoke-WebRequest "https://github.com/xmake-mirror/7zip/releases/download/19.00/7z19.00-${{ matrix.arch }}.zip" -UseBasicParsing -OutFile .\7zip.zip
+          Expand-Archive ./7zip.zip -DestinationPath ./7zip
+          Copy-Item ./7zip/bin/7z.exe ./winenv/bin
+          Copy-Item ./7zip/bin/7z.dll ./winenv/bin
           Invoke-WebRequest "https://github.com/xmake-io/xmake-win64env/raw/master/bin/curl.exe" -UseBasicParsing -OutFile .\curl.exe
           Invoke-WebRequest "https://raw.githubusercontent.com/xmake-io/xmake-win64env/master/bin/curl-ca-bundle.crt" -UseBasicParsing -OutFile .\curl-ca-bundle.crt
           Copy-Item ./curl.exe ./winenv/bin
diff --git a/xmake/repository/packages/7/7z/xmake.lua b/xmake/repository/packages/7/7z/xmake.lua
index 298b972be..ff67544ad 100644
--- a/xmake/repository/packages/7/7z/xmake.lua
+++ b/xmake/repository/packages/7/7z/xmake.lua
@@ -8,10 +8,12 @@ package("7z")
         if os.arch() == "x64" then
             set_urls("https://github.com/xmake-mirror/7zip/releases/download/$(version)/7z$(version)-x64.zip",
                      "https://gitlab.com/xmake-mirror/7zip-releases/raw/master/7z$(version)-x64.zip")
+            add_versions("19.00", "fc21cf510d70a69bfa8e5b0449fe0a054fb76e2f8bd568364821f319c8b1d86d")
             add_versions("18.05", "e6e2d21e2c482f1b1c5a6d21ed80800ce1273b902cf4b9afa68621545540ee2f")
         else
             set_urls("https://github.com/xmake-mirror/7zip/releases/download/$(version)/7z$(version)-x86.zip",
                      "https://gitlab.com/xmake-mirror/7zip-releases/raw/master/7z$(version)-x86.zip")
+            add_versions("19.00", "f84fab081a2d8a6b5868a2eaf01cd56017363fb24560259cea80567f8062334f")
             add_versions("18.05", "544c37bebee30437aba405071484e0ac6310332b4bdabe4ca7420a800d4b4b5e")
         end
     else