From 0b055ddc17768b247cd67a9eb1899d18bdd2c23f Mon Sep 17 00:00:00 2001
From: Dennis Fokin <Dennis.Fokin@yubico.com>
Date: Fri, 11 Nov 2022 12:55:00 +0100
Subject: [PATCH] windows release fixes part 2

---
 .github/workflows/windows.yml      | 5 +----
 resources/win/release-win.ps1      | 4 ++--
 resources/win/yubioath-desktop.wxs | 2 +-
 set-version.py                     | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index dae12dd1..1fecfa0c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -61,8 +61,6 @@ jobs:
         run: |
           $env:PATH += ";$env:WIX\bin"
           $env:SRCDIR = "build\windows\runner\Release\"
-          cp resources\win\license.rtf .
-          cp resources\win\yubioath-desktop.wxs .
           heat dir .\build\windows\runner\Release\ -out fragment.wxs -gg -scom -srd -sfrag -dr INSTALLDIR -cg ApplicationFiles -var env.SRCDIR
           candle .\fragment.wxs .\resources\win\yubioath-desktop.wxs -ext WixUtilExtension -arch x64
           light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop.msi
@@ -75,9 +73,8 @@ jobs:
           mkdir $dest
           mv build\windows\runner\Release\* $dest\
           mv yubioath-desktop.msi deploy
-          mv resources\win\yubioath-desktop.wxs deploy
           mv resources\win\release-win.ps1 deploy
-          mv resources\win\license.rtf deploy
+          mv resources deploy
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
diff --git a/resources/win/release-win.ps1 b/resources/win/release-win.ps1
index a097928e..51201752 100644
--- a/resources/win/release-win.ps1
+++ b/resources/win/release-win.ps1
@@ -1,4 +1,4 @@
-$version=6.0.1-dev.1
+$version="6.0.1-dev.1"
 
 echo "Renaming the Actions folder and moving it"
 mv yubioath-desktop-* release
@@ -10,7 +10,7 @@ signtool.exe sign /fd SHA256 /t http://timestamp.digicert.com/scripts/timstamp.d
 echo "Setting env var and building installer"
 $env:SRCDIR = ".\release\"
 heat dir .\release -out fragment.wxs -gg -scom -srd -sfrag -dr INSTALLDIR -cg ApplicationFiles -var env.SRCDIR
-candle .\fragment.wxs yubioath-desktop.wxs -ext WixUtilExtension -arch x64
+candle .\fragment.wxs resources/win/yubioath-desktop.wxs -ext WixUtilExtension -arch x64
 light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop-$version-win64.msi
 
 echo "Signing the installer"
diff --git a/resources/win/yubioath-desktop.wxs b/resources/win/yubioath-desktop.wxs
index 5dcb4ed9..a3e1257a 100644
--- a/resources/win/yubioath-desktop.wxs
+++ b/resources/win/yubioath-desktop.wxs
@@ -10,7 +10,7 @@
 
       <WixVariable Id="WixUIDialogBmp" Value="resources\icons\yubico-msi-background.png" />
       <WixVariable Id="WixUIBannerBmp" Value="resources\icons\yubico-msi-y-banner.png" />
-      <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
+      <WixVariable Id="WixUILicenseRtf" Value="resources\win\license.rtf" />
 
       <Icon Id="icon.ico" SourceFile="resources\icons\com.yubico.yubioath.ico"/>
       <Property Id="ARPPRODUCTICON" Value="icon.ico" />
diff --git a/set-version.py b/set-version.py
index 6940c31c..d45050c5 100755
--- a/set-version.py
+++ b/set-version.py
@@ -133,8 +133,8 @@ def update_helper_version(buf):
 # release-win.ps1
 def update_release_win(buf):
     return sub1(
-        rf'\$version={version_pattern}',
-        f'$version={version}',
+        rf'\$version="{version_pattern}"',
+        f'$version="{version}"',
         buf,
     )