Back to WiX 3.11 for now

Bootstrapper/Bootstrapper.wixproj

@@ -1,16 +1,42 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.0" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>3.9</ProductVersion>
+    <ProjectGuid>5e5c13a5-635e-4310-a653-0f9760f46935</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
     <OutputName>FeedCenterSetup</OutputName>
     <OutputType>Bundle</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.0" />
+    <Compile Include="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixBalExtensionExt">
+      <HintPath>..\packages\WixBalExtensionExt.1.0.0.49\lib\WixBalExtensionExt.dll</HintPath>
+      <Name>WixBalExtensionExt</Name>
+    </WixExtension>
+    <WixExtension Include="WixFileVersionExtension">
+      <HintPath>..\packages\WixFileVersionExtension.1.0.0.3\lib\WixFileVersionExtension.dll</HintPath>
+      <Name>WixFileVersionExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Application\FeedCenter.csproj">
@@ -30,8 +56,19 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.0" />
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PostBuildEvent />
   </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
 </Project>

Bootstrapper/Bundle.wxs

@@ -1,10 +1,11 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<?xml version="1.0" encoding="UTF-8"?>
 
-	<?define ProductName="Feed Center" ?>
-	<?define CompanyName="Chris Kaczor" ?>
-	<?define ProductVersion="!(bind.packageVersion.FeedCenter)" ?>
-	<?define FileDescription="" ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+
+	<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
+	<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
+	<?define ProductVersion="$(fileVersion.ProductVersion($(var.FeedCenter.TargetPath)))" ?>
 
 	<Bundle Name="$(var.ProductName)"
 	        Version="$(var.ProductVersion)"
@@ -12,41 +13,43 @@
 	        UpgradeCode="5e5c13a5-635e-4310-a653-0f9760f46935"
 	        Compressed="no">
 
-		<BootstrapperApplication Id="WixExtendedBootstrapperApplication.HyperlinkLicense">
-			<!--<bal:WixStandardBootstrapperApplication LaunchPassive="yes" LaunchQuiet="yes" />-->
-			<bal:WixStandardBootstrapperApplication LicenseUrl=""
+		<BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense">
+			<bal:WixExtendedBootstrapperApplication LicenseUrl=""
 			                                        SuppressOptionsUI="yes"
 			                                        ShowVersion="yes"
-			                                        LaunchTarget="[LocalAppDataFolder]$(var.ProductName)\FeedCenter.exe"
-			                                        Theme="hyperlinkLargeLicense" />
-		</BootstrapperApplication>
+			                                        LaunchPassive="yes"
+			                                        LaunchQuiet="yes"
+			                                        LaunchTarget="[LocalAppDataFolder]$(var.ProductName)\FeedCenter.exe" />
+		</BootstrapperApplicationRef>
 
 		<Chain>
 			<ExePackage Id="runtime_desktop_x64"
 			            DisplayName=".NET 7.0 Desktop Runtime (x64)"
-			            InstallArguments="/install /quiet"
+			            InstallCommand="/install /quiet"
 			            Permanent="yes"
+						Compressed="no"
+			            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/dffb1939-cef1-4db3-a579-5475a3061cdd/578b208733c914c7b7357f6baa4ecfd6/windowsdesktop-runtime-7.0.5-win-x64.exe"
+			            Name="windowsdesktop-runtime-7.0.5-win-x64.exe"
 			            InstallCondition='VersionNT64'>
-				<ArpEntry Id="runtime_desktop_x64_arp"
-				          Version="7.0.5.32327"
-				          Win64="yes" />
-				<ExePackagePayload Hash="8907aa0e934a31c63f0a840bf9e734c2f5ba109b766c1a775f8adbb169049753664790c0a15b216f02a942392819a3500e4a33918df10fb967341dc167f82d11"
-				                   DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/dffb1939-cef1-4db3-a579-5475a3061cdd/578b208733c914c7b7357f6baa4ecfd6/windowsdesktop-runtime-7.0.5-win-x64.exe"
-				                   Name="windowsdesktop-runtime-7.0.5-win-x64.exe"
-				                   Size="57609944" />
+				<RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x64)"
+				               Description="Microsoft Windows Desktop Runtime - 7.0.5 (x64)"
+				               Version="7.0.5.32327"
+				               Hash="5B4232EED009E6B66C64A6096B1277995DE63F57"
+				               Size="57609944" />
 			</ExePackage>
 			<ExePackage Id="runtime_desktop_x32"
 			            DisplayName=".NET 7.0 Desktop Runtime (x86)"
-			            InstallArguments="/install /quiet"
+			            InstallCommand="/install /quiet"
 			            Permanent="yes"
+						Compressed="no"
+			            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/eb64dcd1-d277-4798-ada1-600805c9e2dc/fc73c843d66f3996e7ef22468f4902e6/windowsdesktop-runtime-7.0.5-win-x86.exe"
+			            Name="windowsdesktop-runtime-7.0.5-win-x86.exe"
 			            InstallCondition='NOT VersionNT64'>
-				<ArpEntry Id="runtime_desktop_x64_arp"
-				          Version="7.0.5.32327"
-				          Win64="no" />
-				<ExePackagePayload Hash="a2f776cfabcfbd4b9278198301d289ed1c56febd47259520c50b8b8d130a79d0ea99c857aec96865cc635ddf078fd575368c030ce11d61bb9991d296df87a4a7"
-				                   DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/eb64dcd1-d277-4798-ada1-600805c9e2dc/fc73c843d66f3996e7ef22468f4902e6/windowsdesktop-runtime-7.0.5-win-x86.exe"
-				                   Name="windowsdesktop-runtime-7.0.5-win-x86.exe"
-				                   Size="52816632" />
+				<RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x86)"
+				               Description="Microsoft Windows Desktop Runtime - 7.0.5 (x86)"
+				               Version="7.0.5.32327"
+				               Hash="3987657473EA907DEC2FA48F492A5FC2B83B5060"
+				               Size="52816632" />
 			</ExePackage>
 			<MsiPackage Id="FeedCenter"
 			            SourceFile="$(var.Setup.TargetPath)"

Bootstrapper/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="WixBalExtensionExt" version="1.0.0.49" />
+  <package id="WixFileVersionExtension" version="1.0.0.3" />
+</packages>

Setup/Product.wxs

@@ -1,17 +1,23 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<?xml version="1.0" encoding="UTF-8"?>
 
-	<?define ProductName="Feed Center" ?>
-	<?define CompanyName="Chris Kaczor" ?>
-	<?define ProductVersion="!(bind.fileVersion.FeedCenter.exe)" ?>
-	<?define FileDescription="" ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+	<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
+	<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
+	<?define ProductVersion="$(fileVersion.ProductVersion($(var.FeedCenter.TargetPath)))" ?>
+	<?define FileDescription="$(fileVersion.FileDescription($(var.FeedCenter.TargetPath)))" ?>
 
-	<Package Name="$(var.ProductName)"
+	<Product Id="*"
+	         Name="$(var.ProductName)"
 	         Language="1033"
 	         Version="$(var.ProductVersion)"
 	         Manufacturer="$(var.CompanyName)"
-	         UpgradeCode="47f30e4a-a861-47ac-b82d-35e4b886992a"
-	         Scope="perUser">
+	         UpgradeCode="47f30e4a-a861-47ac-b82d-35e4b886992a">
+		<Package InstallerVersion="405"
+		         Compressed="yes"
+		         InstallScope="perUser" />
+
 		<util:CloseApplication Id="CloseApplication"
 		                       Target="FeedCenter.exe"
 		                       CloseMessage="yes"
@@ -22,37 +28,45 @@
 		              AllowSameVersionUpgrades="no"
 		              DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
+		<MediaTemplate />
+
 		<Feature Id="ProductFeature"
 		         Title="$(var.ProductName)"
 		         Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
 		</Feature>
-	</Package>
+	</Product>
 
 	<Fragment>
-		<StandardDirectory Id="LocalAppDataFolder">
-			<Directory Id="INSTALLFOLDER"
-			           Name="$(var.ProductName)">
-				<Directory Id="SqlServerCe_32"
-				           Name="x86" />
-				<Directory Id="SqlServerCe_64"
-				           Name="amd64" />
-				<Directory Name="runtimes">
-					<Directory Name="win-x32">
-						<Directory Id="Runtimes_Win_x32_Native"
-						           Name="native" />
-					</Directory>
-					<Directory Name="win-x64">
-						<Directory Id="Runtimes_Win_x64_Native"
-						           Name="native" />
+		<Directory Id="TARGETDIR"
+		           Name="SourceDir">
+			<Directory Id="LocalAppDataFolder">
+				<Directory Id="INSTALLFOLDER"
+				           Name="$(var.ProductName)">
+					<Directory Id="SqlServerCe_32"
+					           Name="x86" />
+					<Directory Id="SqlServerCe_64"
+					           Name="amd64" />
+					<Directory Id="Runtimes"
+					           Name="runtimes">
+						<Directory Id="Runtimes_Win_x32"
+						           Name="win-x32">
+							<Directory Id="Runtimes_Win_x32_Native"
+							           Name="native" />
+						</Directory>
+						<Directory Id="Runtimes_Win_x64"
+						           Name="win-x64">
+							<Directory Id="Runtimes_Win_x64_Native"
+							           Name="native" />
+						</Directory>
 					</Directory>
 				</Directory>
 			</Directory>
-		</StandardDirectory>
-		<StandardDirectory Id="ProgramMenuFolder">
-			<Directory Id="ApplicationProgramsFolder"
-			           Name="$(var.ProductName)" />
-		</StandardDirectory>
+			<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder"
+				           Name="$(var.ProductName)" />
+			</Directory>
+		</Directory>
 	</Fragment>
 
 	<Fragment>
@@ -60,12 +74,13 @@
 			<Component Id="SqlServerCe_32"
 			           Guid="{800607E9-65ED-489F-83A2-C73AA36A9D1D}"
 			           Directory="SqlServerCe_32">
-				<RegistryValue Root="HKCU"
-				               Key="Software\Feed Center\Setup"
-				               Type="integer"
-				               Name="SqlServerCe_32"
-				               Value="1"
-				               KeyPath="yes" />
+
+				<RegistryValue Root='HKCU'
+				               Key='Software\Feed Center\Setup'
+				               Type='integer'
+				               Name='SqlServerCe_32'
+				               Value='1'
+				               KeyPath='yes' />
 
 				<File Id="sqlceca40_32"
 				      Source="$(var.FeedCenter.TargetDir)\x86\sqlceca40.dll" />
@@ -80,18 +95,19 @@
 				<File Id="sqlcese40_32"
 				      Source="$(var.FeedCenter.TargetDir)\x86\sqlcese40.dll" />
 
-				<RemoveFolder Id="SqlServerCe_32"
-				              On="uninstall" />
+				<RemoveFolder Id='SqlServerCe_32'
+				              On='uninstall' />
 			</Component>
 			<Component Id="SqlServerCe_64"
 			           Guid="{67DB1CF4-23F2-4252-896C-714438959C9A}"
 			           Directory="SqlServerCe_64">
-				<RegistryValue Root="HKCU"
-				               Key="Software\Feed Center\Setup"
-				               Type="integer"
-				               Name="SqlServerCe_64"
-				               Value="1"
-				               KeyPath="yes" />
+
+				<RegistryValue Root='HKCU'
+				               Key='Software\Feed Center\Setup'
+				               Type='integer'
+				               Name='SqlServerCe_64'
+				               Value='1'
+				               KeyPath='yes' />
 
 				<File Id="sqlceca40_64"
 				      Source="$(var.FeedCenter.TargetDir)\amd64\sqlceca40.dll" />
@@ -106,8 +122,8 @@
 				<File Id="sqlcese40_64"
 				      Source="$(var.FeedCenter.TargetDir)\amd64\sqlcese40.dll" />
 
-				<RemoveFolder Id="SqlServerCe_64"
-				              On="uninstall" />
+				<RemoveFolder Id='SqlServerCe_64'
+				              On='uninstall' />
 			</Component>
 			<Component Id="Runtimes_Win_x32_Native"
 			           Guid="{E07B7F53-9FA0-426D-8ADF-A9FFF4E1ED02}"
@@ -120,9 +136,9 @@
 				               KeyPath="yes" />
 
 				<File Id="realm_wrappers.dll_x32"
-				      Source="$(var.FeedCenter.TargetDir)\runtimes\win-x64\native\realm-wrappers.dll" />
+				      Source="$(var.FeedCenter.TargetDir)\runtimes\win-x86\native\realm-wrappers.dll" />
 				<File Id="sni.dll_x32"
-				      Source="$(var.FeedCenter.TargetDir)\runtimes\win-x64\native\sni.dll" />
+				      Source="$(var.FeedCenter.TargetDir)\runtimes\win-x86\native\sni.dll" />
 			</Component>
 			<Component Id="Runtimes_Win_x64_Native"
 			           Guid="{566D640B-F34D-4400-9B86-10EFD669A8B7}"
@@ -142,12 +158,13 @@
 			<Component Id="FeedCenter"
 			           Guid="{9B2B9C65-8E68-4F82-9AC5-16EBCAC34B9E}"
 			           Directory="INSTALLFOLDER">
-				<RegistryValue Root="HKCU"
-				               Key="Software\Feed Center\Setup"
-				               Type="integer"
-				               Name="FeedCenter"
-				               Value="1"
-				               KeyPath="yes" />
+
+				<RegistryValue Root='HKCU'
+				               Key='Software\Feed Center\Setup'
+				               Type='integer'
+				               Name='FeedCenter'
+				               Value='1'
+				               KeyPath='yes' />
 
 				<!-- Capabilities keys for Vista/7 "Set Program Access and Defaults" -->
 				<RegistryValue Root="HKCU"
@@ -331,17 +348,18 @@
 				<File Id="WpfScreenHelper.dll"
 				      Source="$(var.FeedCenter.TargetDir)\WpfScreenHelper.dll" />
 
-				<RemoveFolder Id="INSTALLFOLDER"
-				              On="uninstall" />
+				<RemoveFolder Id='INSTALLFOLDER'
+				              On='uninstall' />
 			</Component>
 			<Component Id="ApplicationShortcut"
 			           Guid="{63CF0995-E117-4BB9-9077-76F570FDFAA9}"
 			           Directory="ApplicationProgramsFolder">
+
 				<Shortcut Id="StartMenuShortcut"
 				          Directory="ApplicationProgramsFolder"
 				          Advertise="no"
 				          Name="$(var.ProductName)"
-				          Target="[INSTALLFOLDER]\FeedCenter.exe"
+				          Target="[INSTALLFOLDER]\$(var.FeedCenter.TargetName)"
 				          WorkingDirectory="INSTALLFOLDER" />
 
 				<RemoveFolder Id="ApplicationProgramsFolder"

Setup/Setup.wixproj

@@ -1,19 +1,46 @@
-<Project Sdk="WixToolset.Sdk/4.0.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>3.9</ProductVersion>
+    <ProjectGuid>dfb3fe30-18ea-4216-8d92-11df9c8d50f1</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Setup</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
     <SuppressIces>ICE91</SuppressIces>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SuppressIces>ICE91</SuppressIces>
   </PropertyGroup>
   <PropertyGroup>
     <SuppressValidation>true</SuppressValidation>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.0" />
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixFileVersionExtension">
+      <HintPath>..\packages\WixFileVersionExtension.1.0.0.3\lib\WixFileVersionExtension.dll</HintPath>
+      <Name>WixFileVersionExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Application\FeedCenter.csproj">
@@ -25,4 +52,16 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
 </Project>

Setup/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="WixFileVersionExtension" version="1.0.0.3" />
+</packages>