template fixes and improvements

iswix-llc · Sep 24, 2023 · 04e9765 · 04e9765
1 parent 89f357b
commit 04e9765
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/...WiX2022AddIn/HeatWaveInternalUISolutionTemplate/BundleProjectTemplate/IsWiXBundle.wixproj b/...WiX2022AddIn/HeatWaveInternalUISolutionTemplate/BundleProjectTemplate/IsWiXBundle.wixproj
@@ -1,14 +1,14 @@
 <Project Sdk="WixToolset.Sdk/4.0.2">
   <PropertyGroup>
     <ProductVersion>3.8</ProductVersion>
-    <OutputName>TestApp</OutputName>
-    <OutputType>Bundle</OutputType>
     <!-- If MSIProductVersion not passed in, try to get it from TFBuild Environments (XAML Builds)-->
     <MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(TF_BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
     <!-- If MSIProductVersion still not known, try to get it from TFBuild Environments (V.Next Builds)-->
     <MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
     <!-- If MSIProductVersion still not known, default to lowerbound 0.0.1 for developer builds.-->
     <MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">0.0.1</MSIProductVersion>
+    <OutputName>$globalsafeprojectname$-$(MSIProductVersion)</OutputName>
+    <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>

diff --git a/...dIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj b/...dIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj
@@ -12,6 +12,8 @@
     <AppxTimestampUrl Condition=" '$(AppxTimestampUrl)' == '' "></AppxTimestampUrl>
     <MsixCertificateThumbprint Condition=" '$(MsixCertificateThumbprint)' == '' "></MsixCertificateThumbprint>
     <MsixTimestampUrl Condition=" '$(MsixTimestampUrl)' == '' "></MsixTimestampUrl>
+    <OutputName>$globalsafeprojectname$-$(MSIProductVersion)</OutputName>
+    <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>

diff --git a/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/Product.wxs b/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/Product.wxs
@@ -7,15 +7,13 @@
   The Product@Id attribute (ProductCode Property) will be a random GUID for each build.  This is to support "Major Upgrades" where each install 
   is a seamless uninstall/reinstall.
   -->
-<Package Name="$safeprojectname$" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="$globalsafeprojectname$" UpgradeCode="$guid3$">
+<Package Name="$globalsafeprojectname$" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="$globalsafeprojectname$" UpgradeCode="$guid3$">
     <MediaTemplate EmbedCab="yes" />
     <!-- Major Upgrade Rule to disallow downgrades -->
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <!-- Launch Condition Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
     <!-- Uncomment below two lines to require .NET 4.8 or later to install -->
     <!-- <PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" />  -->
     <!-- <Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Message="[ProductName] requires .NET Framework 4.8 or later." /> -->
-    <!-- Include User Interface Experience -->
     <Icon Id="Icon.ico" SourceFile="Resources\Icon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
     <Property Id="DISABLEADVTSHORTCUTS" Value="1"></Property>

diff --git a/Application/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/UI.wxs b/Application/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/UI.wxs
@@ -1,7 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Fragment>
     <UI Id="UI">
-      <!-- See http://wix.sourceforge.net/manual-wix3/WixUI_index.htm for more information-->
       <ui:WixUI Id="WixUI_FeatureTree" />
       <!--Uncomment to inject a custom dialog into the install wizard loop -->
       <!--<UIRef Id="CustomDlg"/>-->

diff --git a/...IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj b/...IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj
@@ -11,6 +11,8 @@
     <AppxTimestampUrl Condition=" '$(AppxTimestampUrl)' == '' "></AppxTimestampUrl>
     <MsixCertificateThumbprint Condition=" '$(MsixCertificateThumbprint)' == '' "></MsixCertificateThumbprint>
     <MsixTimestampUrl Condition=" '$(MsixTimestampUrl)' == '' "></MsixTimestampUrl>
+    <OutputName>$globalsafeprojectname$-$(MSIProductVersion)</OutputName>
+    <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>

diff --git a/Application/IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/Product.wxs b/Application/IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/Product.wxs
@@ -7,15 +7,13 @@
   The Product@Id attribute (ProductCode Property) will be a random GUID for each build.  This is to support "Major Upgrades" where each install 
   is a seamless uninstall/reinstall.
   -->
-<Package Name="$safeprojectname$" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="$safeprojectname$" UpgradeCode="$guid3$">
+<Package Name="$globalsafeprojectname$" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="$globalsafeprojectname$" UpgradeCode="$guid3$">
     <MediaTemplate EmbedCab="yes" />
     <!-- Major Upgrade Rule to disallow downgrades -->
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <!-- Launch Condition Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
     <!-- Uncomment below two lines to require .NET 4.8 or Later to install -->
     <!-- <PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" /> -->
     <!-- <Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Message="[ProductName] requires .NET Framework 4.8 or later." /> -->
-    <!-- Include User Interface Experience -->
     <Icon Id="Icon.ico" SourceFile="Resources\Icon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
     <Property Id="DISABLEADVTSHORTCUTS" Value="1"></Property>

diff --git a/Application/IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/UI.wxs b/Application/IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/UI.wxs
@@ -1,7 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Fragment>
     <UI Id="UI">
-      <!-- See http://wix.sourceforge.net/manual-wix3/WixUI_index.htm for more information-->
       <ui:WixUI Id="WixUI_FeatureTree" />
       <!--Uncomment to inject a custom dialog into the install wizard loop -->
       <!--<UIRef Id="CustomDlg"/>-->

diff --git a/...WiX2022AddIn/HeatWaveStandardBASolutionTemplate/BundleProjectTemplate/IsWiXBundle.wixproj b/...WiX2022AddIn/HeatWaveStandardBASolutionTemplate/BundleProjectTemplate/IsWiXBundle.wixproj
@@ -9,6 +9,8 @@
     <MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
     <!-- If MSIProductVersion still not known, default to lowerbound 0.0.1 for developer builds.-->
     <MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">0.0.1</MSIProductVersion>
+    <OutputName>$globalsafeprojectname$-$(MSIProductVersion)</OutputName>
+    <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>

diff --git a/...dIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj b/...dIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj
@@ -12,6 +12,8 @@
     <AppxTimestampUrl Condition=" '$(AppxTimestampUrl)' == '' "></AppxTimestampUrl>
     <MsixCertificateThumbprint Condition=" '$(MsixCertificateThumbprint)' == '' "></MsixCertificateThumbprint>
     <MsixTimestampUrl Condition=" '$(MsixTimestampUrl)' == '' "></MsixTimestampUrl>
+    <OutputName>$globalsafeprojectname$-$(MSIProductVersion)</OutputName>
+    <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>

diff --git a/...tion/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/Product.wxs b/...tion/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/Product.wxs
@@ -7,11 +7,10 @@
   The Product@Id attribute (ProductCode Property) will be a random GUID for each build.  This is to support "Major Upgrades" where each install 
   is a seamless uninstall/reinstall.
   -->
-<Package Name="$safeprojectname$" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="$globalsafeprojectname$" UpgradeCode="$guid3$">
+<Package Name="$globalsafeprojectname$" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="$globalsafeprojectname$" UpgradeCode="$guid3$">
     <MediaTemplate EmbedCab="yes" />
     <!-- Major Upgrade Rule to disallow downgrades -->
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <!-- Launch Condition Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
     <!-- Uncomment below two lines to require .NET 4.8 or later to install -->
     <!-- <PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" />  -->
     <!-- <Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Message="[ProductName] requires .NET Framework 4.8 or later." /> -->