Merge branch 'dev'

iswix-llc · Sep 24, 2023 · 6e95156 · 6e95156
2 parents 2ec5a18 + 89f357b
commit 6e95156
Show file tree

Hide file tree

Showing 40 changed files with 681 additions and 23 deletions.
diff --git a/...te/BootstrapperProjectTemplate/Bundle.wxs → ...Template/BundleProjectTemplate/Bundle.wxs b/...te/BootstrapperProjectTemplate/Bundle.wxs → ...Template/BundleProjectTemplate/Bundle.wxs
@@ -5,7 +5,7 @@
     </BootstrapperApplication>
     <Chain>
  			<PackageGroupRef Id="NetFx48WebAsPrereq"/>
-      <MsiPackage Id="$globalsafeprojectname$" SourceFile="$(var.$globalsafeprojectname$Setup.TargetPath)" />
+      <MsiPackage Id="$globalsafeprojectname$" SourceFile="$(var.$globalsafeprojectname$Package.TargetPath)" />
     </Chain>
   </Bundle>
 </Wix>
diff --git a/...late/BootstrapperProjectTemplate/EULA.rtf → ...onTemplate/BundleProjectTemplate/EULA.rtf b/...late/BootstrapperProjectTemplate/EULA.rtf → ...onTemplate/BundleProjectTemplate/EULA.rtf
diff --git a/...late/BootstrapperProjectTemplate/Icon.ico → ...onTemplate/BundleProjectTemplate/Icon.ico b/...late/BootstrapperProjectTemplate/Icon.ico → ...onTemplate/BundleProjectTemplate/Icon.ico
diff --git a/...late/BootstrapperProjectTemplate/Icon.png → ...onTemplate/BundleProjectTemplate/Icon.png b/...late/BootstrapperProjectTemplate/Icon.png → ...onTemplate/BundleProjectTemplate/Icon.png
diff --git a/...ProjectTemplate/IsWiXBootstrapper.wixproj → ...BundleProjectTemplate/IsWiXBundle.wixproj b/...ProjectTemplate/IsWiXBootstrapper.wixproj → ...BundleProjectTemplate/IsWiXBundle.wixproj
@@ -37,8 +37,8 @@
     <Content Include="Resources\splash.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\$globalsafeprojectname$Setup\$globalsafeprojectname$Setup.wixproj">
-      <Name>$globalsafeprojectname$Setup</Name>
+    <ProjectReference Include="..\$globalsafeprojectname$Package\$globalsafeprojectname$Package.wixproj">
+      <Name>$globalsafeprojectname$Package</Name>
       <Project>{298d4875-b9ce-4cdc-be4a-c3573226727e}</Project>
       <Private>True</Private>
       <DoNotHarvest>True</DoNotHarvest>

diff --git a/...plate/IsWixBootstrapperProject.vstemplate → ...ectTemplate/IsWixBundleProject.vstemplate b/...plate/IsWixBootstrapperProject.vstemplate → ...ectTemplate/IsWixBundleProject.vstemplate
@@ -15,7 +15,7 @@
     <ProjectTypeTag>HeatWave</ProjectTypeTag>
   </TemplateData>
   <TemplateContent>
-    <Project File="IsWiXBootstrapper.wixproj" TargetFileName="$safeprojectname$Bootstrapper.wixproj" ReplaceParameters="true">
+    <Project File="IsWiXBundle.wixproj" TargetFileName="$safeprojectname$Bundle.wixproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" OpenInEditor="true" TargetFileName="Bundle.wxs">Bundle.wxs</ProjectItem>
       <ProjectItem ReplaceParameters="false" OpenInEditor="false" TargetFileName="Resources\EULA.rtf">EULA.rtf</ProjectItem>
       <ProjectItem ReplaceParameters="false" OpenInEditor="false" TargetFileName="Resources\Icon.png">Icon.png</ProjectItem>

diff --git a/...e/BootstrapperProjectTemplate/iuipreq.thm → ...emplate/BundleProjectTemplate/iuipreq.thm b/...e/BootstrapperProjectTemplate/iuipreq.thm → ...emplate/BundleProjectTemplate/iuipreq.thm
diff --git a/...e/BootstrapperProjectTemplate/iuipreq.wxl → ...emplate/BundleProjectTemplate/iuipreq.wxl b/...e/BootstrapperProjectTemplate/iuipreq.wxl → ...emplate/BundleProjectTemplate/iuipreq.wxl
diff --git a/...te/BootstrapperProjectTemplate/splash.bmp → ...Template/BundleProjectTemplate/splash.bmp b/...te/BootstrapperProjectTemplate/splash.bmp → ...Template/BundleProjectTemplate/splash.bmp
diff --git a/...iXBootstrapperSolutionTemplate.vstemplate → ...UIBootstrapperSolutionTemplate.vstemplate b/...iXBootstrapperSolutionTemplate.vstemplate → ...UIBootstrapperSolutionTemplate.vstemplate
@@ -1,8 +1,8 @@
 <VSTemplate Version="3.0.0" Type="ProjectGroup" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
 	<TemplateData>
-		<Name>IsWiX Bootstrapper (WiX v4)</Name>
-		<TemplateID>IsWiX.BootstrapperProject</TemplateID>
-		<Description>A multiple project solution accelerator for creating a WiX bootstrapper (.exe) file and Windows installation package (.msi) file.</Description>
+		<Name>IsWiX Bundle - InternalUI (WiX v4)</Name>
+		<TemplateID>IsWiX.InternalUIBundleProject</TemplateID>
+		<Description>A multiple project solution accelerator for creating a WiX InternalUI Bundle (.exe) file and Windows installation package (.msi) file. InternalUI delegates the UI to the MSI.</Description>
 		<Icon>IsWiX.ico</Icon>
 		<ProjectType>HeatWave</ProjectType>
 		<SortOrder>20</SortOrder>
@@ -20,8 +20,8 @@
 	</WizardExtension>
 	<WizardData>
 		<Settings>
-			<MappedProjectTemplate name="$projectname$Setup" path="$projectname$Setup" template="SetupProjectTemplate\IsWixProject.vstemplate" />
-			<MappedProjectTemplate name="$projectname$Bootstrapper" path="$projectname$Bootstrapper" template="BootstrapperProjectTemplate\IsWixBootstrapperProject.vstemplate" />
+			<MappedProjectTemplate name="$projectname$Package" path="$projectname$Package" template="PackageProjectTemplate\IsWixProject.vstemplate" />
+			<MappedProjectTemplate name="$projectname$Bundle" path="$projectname$Bundle" template="BundleProjectTemplate\IsWixBundleProject.vstemplate" />
 		</Settings>
 	</WizardData>
 

diff --git a/...aveBootstrapperSolutionTemplate/IsWiX.ico → ...tWaveInternalUISolutionTemplate/IsWiX.ico b/...aveBootstrapperSolutionTemplate/IsWiX.ico → ...tWaveInternalUISolutionTemplate/IsWiX.ico
diff --git a/...nTemplate/SetupProjectTemplate/Banner.jpg → ...emplate/PackageProjectTemplate/Banner.jpg b/...nTemplate/SetupProjectTemplate/Banner.jpg → ...emplate/PackageProjectTemplate/Banner.jpg
diff --git a/...nTemplate/SetupProjectTemplate/Dialog.jpg → ...emplate/PackageProjectTemplate/Dialog.jpg b/...nTemplate/SetupProjectTemplate/Dialog.jpg → ...emplate/PackageProjectTemplate/Dialog.jpg
diff --git a/...ionTemplate/SetupProjectTemplate/EULA.rtf → ...nTemplate/PackageProjectTemplate/EULA.rtf b/...ionTemplate/SetupProjectTemplate/EULA.rtf → ...nTemplate/PackageProjectTemplate/EULA.rtf
diff --git a/...onTemplate/SetupProjectTemplate/Files.wxs → ...Template/PackageProjectTemplate/Files.wxs b/...onTemplate/SetupProjectTemplate/Files.wxs → ...Template/PackageProjectTemplate/Files.wxs
diff --git a/...Template/SetupProjectTemplate/IISMeta.wxs → ...mplate/PackageProjectTemplate/IISMeta.wxs b/...Template/SetupProjectTemplate/IISMeta.wxs → ...mplate/PackageProjectTemplate/IISMeta.wxs
diff --git a/...ionTemplate/SetupProjectTemplate/Icon.ico → ...nTemplate/PackageProjectTemplate/Icon.ico b/...ionTemplate/SetupProjectTemplate/Icon.ico → ...nTemplate/PackageProjectTemplate/Icon.ico
diff --git a/...ProjectTemplate/IsWiXSetupProject.wixproj → ...ojectTemplate/IsWiXPackageProject.wixproj b/...ProjectTemplate/IsWiXSetupProject.wixproj → ...ojectTemplate/IsWiXPackageProject.wixproj
diff --git a/...upProjectTemplate/IsWixProject.vstemplate → ...geProjectTemplate/IsWixProject.vstemplate b/...upProjectTemplate/IsWixProject.vstemplate → ...geProjectTemplate/IsWixProject.vstemplate
@@ -16,7 +16,7 @@
     <LanguageTag>WiX</LanguageTag>
   </TemplateData>
   <TemplateContent>
-    <Project File="IsWiXSetupProject.wixproj" TargetFileName="$safeprojectname$.wixproj" ReplaceParameters="true">
+    <Project File="IsWiXPackageProject.wixproj" TargetFileName="$safeprojectname$Package.wixproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" OpenInEditor="true" TargetFileName="Product.wxs">Product.wxs</ProjectItem>
       <ProjectItem ReplaceParameters="true" OpenInEditor="true" TargetFileName="$globalsafeprojectname$Files.wxs">Files.wxs</ProjectItem>
       <ProjectItem ReplaceParameters="true" OpenInEditor="false" TargetFileName="IISMeta.wxs">IISMeta.wxs</ProjectItem>

diff --git a/...Template/SetupProjectTemplate/Product.wxs → ...mplate/PackageProjectTemplate/Product.wxs b/...Template/SetupProjectTemplate/Product.wxs → ...mplate/PackageProjectTemplate/Product.wxs
diff --git a/.../SetupProjectTemplate/UI-CustomDialog.wxs → ...ackageProjectTemplate/UI-CustomDialog.wxs b/.../SetupProjectTemplate/UI-CustomDialog.wxs → ...ackageProjectTemplate/UI-CustomDialog.wxs
diff --git a/...utionTemplate/SetupProjectTemplate/UI.wxs → ...ionTemplate/PackageProjectTemplate/UI.wxs b/...utionTemplate/SetupProjectTemplate/UI.wxs → ...ionTemplate/PackageProjectTemplate/UI.wxs
diff --git a/...cation/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/BundleProjectTemplate/Bundle.wxs b/...cation/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/BundleProjectTemplate/Bundle.wxs
@@ -0,0 +1,14 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Name="$globalsafeprojectname$" Version="$(var.MSIProductVersion)" Manufacturer="$globalsafeprojectname$" UpgradeCode="$guid3$">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseFile="Resources\EULA.rtf" LogoFile="Resources\Icon.png" Theme="rtfLicense" ThemeFile="Resources\RtfTheme.xml"  LocalizationFile="Resources\RtfTheme.wxl" />
+    </BootstrapperApplication>
+    <Variable Name="InstallFolder" bal:Overridable="yes" Type="formatted" Value="[ProgramFiles6432Folder]\My Company\$globalsafeprojectname$"/>
+    <Chain>
+ 			<PackageGroupRef Id="NetFx48WebAsPrereq"/>
+      <MsiPackage Id="$globalsafeprojectname$" SourceFile="$(var.$globalsafeprojectname$Package.TargetPath)">
+        <MsiProperty Name="INSTALLLOCATION" Value="[InstallFolder]"/>
+      </MsiPackage>
+    </Chain>
+  </Bundle>
+</Wix>