From 82acf32b9e75b8594084468b8af01949de5e96e3 Mon Sep 17 00:00:00 2001
From: Nir Bar <nir.bar@panel-sw.co.il>
Date: Wed, 18 Sep 2024 12:28:50 +0300
Subject: [PATCH] Upgrade PanelSwWix4 and 7Zap nugets to boost 7z container
 creation time

---
 .github/workflows/github-actions-build.yml | 10 +++++-----
 src/Directory.Packages.props               |  4 ++--
 src/global.json                            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
index 996c208..7794478 100644
--- a/.github/workflows/github-actions-build.yml
+++ b/.github/workflows/github-actions-build.yml
@@ -11,17 +11,17 @@ on:
       psw_wix_version:
         description: 'PanelSwWix4 version'
         required: true
-        default: 5.0.0-psw-wix.0285-52
+        default: 5.0.0-psw-wix.0297-54
         type: string
 
 jobs:
   PanelSwWixExtension-Build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4.1.7
         with:
           submodules: 'true'
-      - uses: microsoft/setup-msbuild@v1
+      - uses: microsoft/setup-msbuild@v2
 
       - name: Resolve build version
         run: |
@@ -37,7 +37,7 @@ jobs:
             Add-Content -Path ${{ github.env }} -Value "PSW_WIX_VERSION=${{ env.DEFAULT_PSW_WIX_VERSION }}"
           }
         env:
-          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0285-52'
+          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0297-54'
 
       - name: Prepare for build
         run: |
@@ -54,7 +54,7 @@ jobs:
           Remove-Item ("${{ github.workspace }}" + "\build") -Recurse -Force
           msbuild src/dirs.proj -restore -p:FullVersion=${{ env.FULL_VERSION }} "-p:PanelSwWix4Version=${{ env.PSW_WIX_VERSION }}" -p:NugetPrereleaseVersion=-psw-wix -p:EnableZipContainer=true
 
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v4.4.0
         with:
           name: nuget
           path: nuget-out\*.nupkg
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index b77b5b2..91f00df 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <Wix4Version Condition=" '$(Wix4Version)' == '' ">4.0.5</Wix4Version>
-    <PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">5.0.0-psw-wix.0285-52</PanelSwWix4Version>
-    <SevenZapVersion Condition=" '$(SevenZapVersion)' == '' ">23.1.36</SevenZapVersion>
+    <PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">5.0.0-psw-wix.0297-54</PanelSwWix4Version>
+    <SevenZapVersion Condition=" '$(SevenZapVersion)' == '' ">23.1.37</SevenZapVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="WixToolset.DUtil" version="$(Wix4Version)" />
diff --git a/src/global.json b/src/global.json
index 751819c..28225e2 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,7 +1,7 @@
 {
   "msbuild-sdks": {
     "WixToolset.Sdk": "4.0.5",
-    "PanelSwWix4.Sdk": "5.0.0-psw-wix.0285-52",
+    "PanelSwWix4.Sdk": "5.0.0-psw-wix.0297-54",
     "Microsoft.Build.Traversal": "4.0.0"
   }
 }