SNOW-1055755: windows build debug - ...wix util schema update - min t…

…est 4
snowflakedb · Sep 10, 2024 · 912d857 · 912d857
1 parent d149050
commit 912d857
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/scripts/packaging/win/build_snowflake_cli.bat b/scripts/packaging/win/build_snowflake_cli.bat
@@ -41,8 +41,8 @@ REM Build MSI-installer
 cd ..\..
 dir /r .
 REM Generate wxs file for Wix
-python.exe -m hatch -e packaging run ^
-  python scripts\packaging\win\wxs_builder.py
+REM python.exe -m hatch -e packaging run ^
+REM   python scripts\packaging\win\wxs_builder.py
 
 candle ^
     -dSnowflakeCLIVersion=%CLI_VERSION% ^

diff --git a/scripts/packaging/win/snowflake_cli.wxs b/scripts/packaging/win/snowflake_cli.wxs
@@ -14,11 +14,10 @@
     <Property Id="ARPURLINFOABOUT" Value="https://snowflake.com/" />
     <Property Id="ApplicationFolderName" Value="Snowflake CLI" />
     <Property Id="WixAppFolder" Value="WixUISupportPerUser" />
-  <StandardDirectory Id="ProgramFiles6432Folder">
-    <Directory
-        Id="INSTALLFOLDER"
-        Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)"
-    />
-</StandardDirectory>
-    </Package>
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+    <UIRef Id="WixUI_InstallDir" />
+  </Package>
 </Wix>