Merge pull request #15 from sjackson0109/fix/msi-package-version

fix(ci): use 2-digit year for MSI PackageVersion
pull/4062/head
Simon Jackson 1 month ago committed by GitHub
commit 8a5fbe9870
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -9,7 +9,6 @@ on:
- 'msi/**' - 'msi/**'
- 'src-x86-x64-Fusix/**' - 'src-x86-x64-Fusix/**'
- 'src-csharp/**' - 'src-csharp/**'
- '.github/workflows/build-and-release.yml'
workflow_dispatch: workflow_dispatch:
inputs: inputs:
tag: tag:
@ -23,7 +22,7 @@ on:
default: false default: false
concurrency: concurrency:
group: release group: ${{ github.workflow }}-${{ github.ref_name }}
cancel-in-progress: true cancel-in-progress: true
env: env:
@ -439,7 +438,9 @@ jobs:
- name: Build MSI packages - name: Build MSI packages
shell: pwsh shell: pwsh
run: | run: |
$ver = '${{ steps.build_ver.outputs.version }}' $ver = '${{ steps.build_ver.outputs.version }}'
# MSI ProductVersion requires major<256; strip century: "2026.4.2" -> "26.4.2"
$msiVer = $ver.Substring(2)
foreach ($arch in @('x64', 'x86', 'arm64')) { foreach ($arch in @('x64', 'x86', 'arm64')) {
# Stage arch-specific inputs next to the .wixproj # Stage arch-specific inputs next to the .wixproj
Copy-Item ".\rdpwrap_$arch.dll" "msi\rdpwrap_$arch.dll" -Force Copy-Item ".\rdpwrap_$arch.dll" "msi\rdpwrap_$arch.dll" -Force
@ -451,7 +452,7 @@ jobs:
-c Release ` -c Release `
/p:Platform=$arch ` /p:Platform=$arch `
/p:OutputName="RDPWrapper-$arch" ` /p:OutputName="RDPWrapper-$arch" `
/p:PackageVersion=$ver ` /p:PackageVersion=$msiVer `
/p:OutputPath="$PWD/msi_out/$arch" /p:OutputPath="$PWD/msi_out/$arch"
if ($LASTEXITCODE -ne 0) { throw "WiX build failed for $arch" } if ($LASTEXITCODE -ne 0) { throw "WiX build failed for $arch" }

Loading…
Cancel
Save