Skip to content

Commit

Permalink
Upgrade PanelSwWix4 and 7Zap nugets to boost 7z container creation time
Browse files Browse the repository at this point in the history
  • Loading branch information
nirbar committed Sep 18, 2024
1 parent 9da6bcd commit 82acf32
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/github-actions-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
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: '5.0.0-psw-wix.0285-52'
DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0297-54'

- name: Prepare for build
run: |
Expand All @@ -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
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)' == '' ">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)" />
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": "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"
}
}

0 comments on commit 82acf32

Please sign in to comment.