show license agreement. remove bitmap from Minimal UI, to fit license text better

Builds/VisualStudio2017/juicysfplugin.sln

@@ -66,7 +66,7 @@ Global
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug|x64.ActiveCfg = Debug|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|Win32.ActiveCfg = Release|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|Win32.Build.0 = Release|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|x64.ActiveCfg = Release|Win32
+		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|x64.ActiveCfg = Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Builds/WixSetup/.gitignore

@@ -1,2 +1,3 @@
-bin
+x64
-obj
+Win32
+juicysfplugin-*.zip

Builds/WixSetup/Config.wxi

@@ -9,9 +9,10 @@
   <?define LicenseConcatSrcRoot = "$(var.juicysfplugin_StandalonePlugin.ProjectDir)" ?>
   <?define LicenseSrcRoot = "$(var.juicysfplugin_StandalonePlugin.ProjectDir)licenses_of_dependencies\" ?>
   <?define LibSrcRoot = "$(var.juicysfplugin_StandalonePlugin.TargetDir)" ?>
+  <?define licenseRtf = "$(var.LicenseConcatSrcRoot)license_concatenated.rtf" ?>
 
   <!-- Product name as you want it to appear in Add/Remove Programs-->
-  <?if "$(var.Platform)" = "x64" ?>
+  <?if "$(sys.BUILDARCH)" = "x64" ?>
     <?define ProductName = "$(var.Name) (64 bit)" ?>
     <?define Win64 = "yes" ?>
     <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>

Builds/WixSetup/MyWelcomeEulaDlg.wxs

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <Fragment>
+    <UI>
+      <Dialog Id="MyWelcomeEulaDlg" Width="370" Height="270" Title="!(loc.WelcomeEulaDlg_Title)">
+        <!--
+        <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeEulaDlgBitmap)" />
+        -->
+        <Control Id="Title" Type="Text" X="16" Y="6" Width="336" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgTitle)" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="16" Y="207" Width="340" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
+        <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+          <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
+        </Control>
+        <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+        <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">
+          <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+          <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+          <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+          <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+          <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+          <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+          <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
+          <Condition Action="enable">LicenseAccepted = "1"</Condition>
+          <Condition Action="show">ALLUSERS</Condition>
+        </Control>
+        <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">
+          <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+          <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+          <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+          <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+          <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+          <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+          <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
+          <Condition Action="enable">LicenseAccepted = "1"</Condition>
+          <Condition Action="show">NOT ALLUSERS</Condition>
+        </Control>
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="LicenseText" Type="ScrollableText" X="16" Y="36" Width="340" Height="162" Sunken="yes" TabSkip="no">
+          <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" />
+        </Control>
+      </Dialog>
+    </UI>
+
+    <InstallUISequence>
+      <Show Dialog="MyWelcomeEulaDlg" Before="ProgressDlg" Overridable="yes">NOT Installed</Show>
+    </InstallUISequence>
+  </Fragment>
+</Wix>

Builds/WixSetup/Product.wxs

@@ -2,15 +2,16 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include $(sys.CURRENTDIR)\Config.wxi?>
-	<Product Id="*" Name="$(var.Name)" Language="1033" Version="1.0.0.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="e03ac63d-63d8-48d1-ab6c-ba539f7d523f">
+	<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="2.3.1" Manufacturer="$(var.Manufacturer)" UpgradeCode="e03ac63d-63d8-48d1-ab6c-ba539f7d523f">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="$(var.WixPlatform)" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate />
 
-    <WixVariable Id="WixUILicenseRtf" Value="license_concatenated.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.licenseRtf)" />
+    <UIRef Id="WixUI_MyMinimal" />
     
-		<Feature Id="ProductFeature" Title="WixSetup" Level="1">
+    <Feature Id="ProductFeature" Title="juicysfplugin" Level="1">
 			<ComponentGroupRef Id="StandaloneAppComponents" />
       <ComponentGroupRef Id="LicenseComponents" />
       <ComponentGroupRef Id="LicenseConcatComponents" />

Builds/WixSetup/WixSetup.wixproj

@@ -15,17 +15,34 @@
     <OutputName>WixSetup</OutputName>
     <OutputType>Package</OutputType>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>$(Platform)\$(Configuration)\bin\</OutputPath>
+    <IntermediateOutputPath>$(Platform)\$(Configuration)\obj\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>$(Platform)\$(Configuration)\bin\</OutputPath>
+    <IntermediateOutputPath>$(Platform)\$(Configuration)\obj\</IntermediateOutputPath>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>$(Platform)\$(Configuration)\bin\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>$(Platform)\$(Configuration)\obj\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>$(Platform)\$(Configuration)\bin\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>$(Platform)\$(Configuration)\obj\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixToolPath)WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MyWelcomeEulaDlg.wxs" />
     <Compile Include="Product.wxs" />
+    <Compile Include="WixUI_MyMinimal.wxs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VisualStudio2017\juicysfplugin_StandalonePlugin.vcxproj">

Builds/WixSetup/WixUI_MyMinimal.wxs

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+
+<!--
+First-time install dialog sequence:
+ - WixUI_WelcomeEulaDlg
+
+Maintenance dialog sequence:
+ WixUI_MaintenanceWelcomeDlg
+ - WixUI_MaintenanceTypeDlg
+ - WixUI_VerifyReadyDlg
+
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI Id="WixUI_MyMinimal">
+            <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="Minimal" />
+
+            <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="WelcomeDlg" />
+            <DialogRef Id="MyWelcomeEulaDlg" />
+
+            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</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>
+
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+            <InstallUISequence>
+                <Show Dialog="WelcomeDlg" Before="MyWelcomeEulaDlg">Installed AND PATCH</Show>
+                <Show Dialog="MyWelcomeEulaDlg" Before="ProgressDlg">NOT Installed</Show>
+            </InstallUISequence>
+
+            <Property Id="ARPNOMODIFY" Value="1" />
+        </UI>
+
+        <UIRef Id="WixUI_Common" />
+    </Fragment>
+</Wix>