Skip to content

Commit

Permalink
Upgrade 7Zap to 24.08
Browse files Browse the repository at this point in the history
Upgrade PanelSwWix4 for single-threaded container creation
  • Loading branch information
nirbar committed Sep 19, 2024
1 parent 4c5929a commit d6707ec
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/github-actions-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
psw_wix_version:
description: 'PanelSwWix4 version'
required: true
default: 6.0.0-psw-wix.0298-20
default: 6.0.0-psw-wix.0300-21
type: string

jobs:
Expand All @@ -37,7 +37,7 @@ jobs:
Add-Content -Path ${{ github.env }} -Value "PSW_WIX_VERSION=${{ env.DEFAULT_PSW_WIX_VERSION }}"
}
env:
DEFAULT_PSW_WIX_VERSION: '6.0.0-psw-wix.0298-20'
DEFAULT_PSW_WIX_VERSION: '6.0.0-psw-wix.0300-21'

- name: Prepare for build
run: |
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<Wix4Version Condition=" '$(Wix4Version)' == '' ">5.0.0</Wix4Version>
<PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">6.0.0-psw-wix.0298-20</PanelSwWix4Version>
<SevenZapVersion Condition=" '$(SevenZapVersion)' == '' ">23.1.37</SevenZapVersion>
<PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">6.0.0-psw-wix.0300-21</PanelSwWix4Version>
<SevenZapVersion Condition=" '$(SevenZapVersion)' == '' ">24.8.40</SevenZapVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="WixToolset.DUtil" version="$(Wix4Version)" />
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"msbuild-sdks": {
"WixToolset.Sdk": "5.0.0",
"PanelSwWix4.Sdk": "6.0.0-psw-wix.0298-20",
"PanelSwWix4.Sdk": "6.0.0-psw-wix.0300-21",
"Microsoft.Build.Traversal": "4.0.0"
}
}

0 comments on commit d6707ec

Please sign in to comment.