From 5ccfd8be805646aac7d0b9e6bd1b9ed1e5240d79 Mon Sep 17 00:00:00 2001
From: Marcin Raba <marcin.raba@snowflake.com>
Date: Tue, 10 Sep 2024 12:58:35 +0200
Subject: [PATCH] SNOW-1055755: windows build debug - ...wix util schema update
 - min test 5

---
 scripts/packaging/win/snowflake_cli.wxs       |  8 +-
 scripts/packaging/win/snowflake_cli_min.wxs   | 18 ----
 .../packaging/win/snowflake_cli_template.wxs  | 95 -------------------
 .../win/snowflake_cli_template_v4.wxs         | 82 ----------------
 4 files changed, 3 insertions(+), 200 deletions(-)
 delete mode 100644 scripts/packaging/win/snowflake_cli_min.wxs
 delete mode 100644 scripts/packaging/win/snowflake_cli_template.wxs
 delete mode 100644 scripts/packaging/win/snowflake_cli_template_v4.wxs

diff --git a/scripts/packaging/win/snowflake_cli.wxs b/scripts/packaging/win/snowflake_cli.wxs
index c612e0d0d3..aa0b7d6fb8 100644
--- a/scripts/packaging/win/snowflake_cli.wxs
+++ b/scripts/packaging/win/snowflake_cli.wxs
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Package Name="Snowflake CLI" Language="1033" Version="$(var.SnowflakeCLIVersion)" Manufacturer="Snowflake, Inc." UpgradeCode="42280567-AE10-4184-8BB4-F98F59519CB2" InstallerVersion="405">
     <SummaryInformation Manufacturer="Snowflake, Inc." />
     <WixVariable Id="WixUIDialogBmp" Value="scripts\packaging\win\snowflake_msi_background.png" />
     <WixVariable Id="WixUIBannerBmp" Value="scripts\packaging\win\snowflake_msi_banner.png" />
     <Media Id="1" Cabinet="snow.cab" EmbedCab="yes" />
     <MajorUpgrade AllowDowngrades="yes" />
-      <Files Include="..\..\..\dist\snow\**" />
+    <Files Include="..\..\..\dist\snow\**" />
     <Icon Id="icon.ico" SourceFile="scripts\packaging\win\snowflake_msi.ico" />
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
     <Property Id="ARPHELPLINK" Value="https://docs.snowflake.net/manuals/user-guide/snowflake-cli.html" />
-    <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
     <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.ProductName)" />
     </StandardDirectory>
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
-    <UIRef Id="WixUI_InstallDir" />
+    <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
   </Package>
 </Wix>
diff --git a/scripts/packaging/win/snowflake_cli_min.wxs b/scripts/packaging/win/snowflake_cli_min.wxs
deleted file mode 100644
index 33389f3615..0000000000
--- a/scripts/packaging/win/snowflake_cli_min.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Package Name="Snowflake CLI" Language="1033" Version="$(var.SnowflakeCLIVersion)" Manufacturer="Snowflake, Inc." UpgradeCode="42280567-AE10-4184-8BB4-F98F59519CB2" InstallerVersion="405">
-    <SummaryInformation Manufacturer="Snowflake, Inc." />
-    <WixVariable Id="WixUIDialogBmp" Value="scripts\packaging\win\snowflake_msi_background.png" />
-    <WixVariable Id="WixUIBannerBmp" Value="scripts\packaging\win\snowflake_msi_banner.png" />
-    <Media Id="1" Cabinet="snow.cab" EmbedCab="yes" />
-    <MajorUpgrade AllowDowngrades="yes" />
-      <Files Include="..\..\..\dist\snow\**" />
-    <Icon Id="icon.ico" SourceFile="scripts\packaging\win\snowflake_msi.ico" />
-    <Property Id="ARPPRODUCTICON" Value="icon.ico" />
-    <Property Id="ARPHELPLINK" Value="https://docs.snowflake.net/manuals/user-guide/snowflake-cli.html" />
-    <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
-    <Property Id="ARPURLINFOABOUT" Value="https://snowflake.com/" />
-    <Property Id="ApplicationFolderName" Value="Snowflake CLI" />
-    <Property Id="WixAppFolder" Value="WixUISupportPerUser" />
-  </Package>
-</Wix>
diff --git a/scripts/packaging/win/snowflake_cli_template.wxs b/scripts/packaging/win/snowflake_cli_template.wxs
deleted file mode 100644
index 99ee754768..0000000000
--- a/scripts/packaging/win/snowflake_cli_template.wxs
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product
-        Id="*"
-        Name="Snowflake CLI"
-        Language="1033"
-        Version="$(var.SnowflakeCLIVersion)"
-        Manufacturer="Snowflake, Inc."
-        UpgradeCode="42280567-AE10-4184-8BB4-F98F59519CB2">
-        <Package Id="*"
-            InstallerVersion="405"
-            Compressed="yes"
-            InstallScope="perMachine"
-            Manufacturer="Snowflake, Inc."
-            Platform="x64" />
-        <WixVariable Id="WixUIDialogBmp" Value="scripts\packaging\win\snowflake_msi_background.png" />
-        <WixVariable Id="WixUIBannerBmp" Value="scripts\packaging\win\snowflake_msi_banner.png" />
-        <Media Id="1" Cabinet="snow.cab" EmbedCab="yes" />
-        <MajorUpgrade AllowDowngrades="yes"/>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFiles64Folder" Name="PFiles">
-                 <Directory Id="TESTFILEPRODUCTDIR" Name="Snowflake CLI"/>
-            </Directory>
-        </Directory>
-        <DirectoryRef Id="TESTFILEPRODUCTDIR">
-            <Component Id="snow.exe" Guid="3FDE264C-66C4-4B6C-AE4C-F42618FB98BC" Win64="yes">
-                <Environment Id="PATH" Name="PATH" Value="[TESTFILEPRODUCTDIR]" Permanent="no" Part="last" Action="set" System="yes"/>
-                <File Id="snow.exe" Source="dist\snow\snow.exe" KeyPath="yes" Checksum="yes"/>
-            </Component>
-        </DirectoryRef>
-        <Feature Id="MainApplication" Title="Snowflake CLI" Level="1">
-            <ComponentRef Id="snow.exe" />
-        </Feature>
-        <Icon Id="icon.ico" SourceFile="scripts\packaging\win\snowflake_msi.ico"/>
-        <Property Id="ARPPRODUCTICON" Value="icon.ico" />
-        <Property Id="ARPHELPLINK" Value="https://docs.snowflake.net/manuals/user-guide/snowflake-cli.html" />
-        <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
-        <Property Id="ARPURLINFOABOUT">https://snowflake.com/</Property>
-        <Property Id="WIXUI_INSTALLDIR" Value="TESTFILEPRODUCTDIR"/>
-        <UIRef Id="WixUI_InstallDir2" />
-        <Property Id="ApplicationFolderName" Value="Snowflake CLI" />
-        <Property Id="WixAppFolder" Value="WixUISupportPerUser" />
-        <CustomActionRef Id="WixBroadcastSettingChange" />
-        <CustomActionRef Id="WixBroadcastEnvironmentChange" />
-    </Product>
-    <Fragment>
-        <UI Id="WixUI_InstallDir2">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            <DialogRef Id="SnowflakeCLIExitDlg"/>
-
-            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="SnowflakeCLIExitDlg" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-        </UI>
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>
diff --git a/scripts/packaging/win/snowflake_cli_template_v4.wxs b/scripts/packaging/win/snowflake_cli_template_v4.wxs
deleted file mode 100644
index 6d80246595..0000000000
--- a/scripts/packaging/win/snowflake_cli_template_v4.wxs
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="Snowflake CLI" Language="1033" Version="$(var.SnowflakeCLIVersion)" Manufacturer="Snowflake, Inc." UpgradeCode="42280567-AE10-4184-8BB4-F98F59519CB2" InstallerVersion="405"><SummaryInformation Manufacturer="Snowflake, Inc." />
-        <WixVariable Id="WixUIDialogBmp" Value="scripts\packaging\win\snowflake_msi_background.png" />
-        <WixVariable Id="WixUIBannerBmp" Value="scripts\packaging\win\snowflake_msi_banner.png" />
-        <Media Id="1" Cabinet="snow.cab" EmbedCab="yes" />
-        <MajorUpgrade AllowDowngrades="yes" />
-
-        <DirectoryRef Id="TESTFILEPRODUCTDIR">
-            <Component Id="snow.exe" Guid="3FDE264C-66C4-4B6C-AE4C-F42618FB98BC" Bitness="always64">
-                <Environment Id="PATH" Name="PATH" Value="[TESTFILEPRODUCTDIR]" Permanent="no" Part="last" Action="set" System="yes" />
-                <File Id="snow.exe" Source="dist\snow\snow.exe" KeyPath="yes" Checksum="yes" />
-            </Component>
-        </DirectoryRef>
-        <Feature Id="MainApplication" Title="Snowflake CLI" Level="1">
-            <ComponentRef Id="snow.exe" />
-        </Feature>
-        <Icon Id="icon.ico" SourceFile="scripts\packaging\win\snowflake_msi.ico" />
-        <Property Id="ARPPRODUCTICON" Value="icon.ico" />
-        <Property Id="ARPHELPLINK" Value="https://docs.snowflake.net/manuals/user-guide/snowflake-cli.html" />
-        <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
-        <Property Id="ARPURLINFOABOUT" Value="https://snowflake.com/" />
-        <Property Id="WIXUI_INSTALLDIR" Value="TESTFILEPRODUCTDIR" />
-        <UIRef Id="WixUI_InstallDir2" />
-        <Property Id="ApplicationFolderName" Value="Snowflake CLI" />
-        <Property Id="WixAppFolder" Value="WixUISupportPerUser" />
-        <util:BroadcastSettingChange />
-        <util:BroadcastEnvironmentChange />
-
-            <StandardDirectory Id="ProgramFiles64Folder">
-                 <Directory Id="TESTFILEPRODUCTDIR" Name="Snowflake CLI" />
-            </StandardDirectory>
-        </Package>
-    <Fragment>
-        <UI Id="WixUI_InstallDir2">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            <DialogRef Id="SnowflakeCLIExitDlg" />
-
-            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Order="3" />
-            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
-
-            <Publish Dialog="SnowflakeCLIExitDlg" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
-
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Condition="NOT Installed" />
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
-
-            <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" />
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=&quot;1&quot;" />
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" />
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" />
-
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" />
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
-
-            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
-            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
-            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
-        </UI>
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>