From 504cc80470743746c331e9f5e2233db1dca1922a Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Mon, 24 Apr 2023 19:04:26 -0400 Subject: [PATCH] Back to WiX 3.11 for now --- Bootstrapper/Bootstrapper.wixproj | 45 +++++++++- Bootstrapper/Bundle.wxs | 59 ++++++------- Bootstrapper/packages.config | 5 ++ Setup/Product.wxs | 132 +++++++++++++++++------------- Setup/Setup.wixproj | 43 +++++++++- Setup/packages.config | 4 + 6 files changed, 197 insertions(+), 91 deletions(-) create mode 100644 Bootstrapper/packages.config create mode 100644 Setup/packages.config diff --git a/Bootstrapper/Bootstrapper.wixproj b/Bootstrapper/Bootstrapper.wixproj index f9af1d9..1c2d8fc 100644 --- a/Bootstrapper/Bootstrapper.wixproj +++ b/Bootstrapper/Bootstrapper.wixproj @@ -1,16 +1,42 @@ - - + + + Debug + x86 3.9 + 5e5c13a5-635e-4310-a653-0f9760f46935 + 2.0 FeedCenterSetup Bundle + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets OnOutputUpdated + bin\$(Configuration)\ + obj\$(Configuration)\ Debug + + bin\$(Configuration)\ + obj\$(Configuration)\ + - + + + + + ..\packages\WixBalExtensionExt.1.0.0.49\lib\WixBalExtensionExt.dll + WixBalExtensionExt + + + ..\packages\WixFileVersionExtension.1.0.0.3\lib\WixFileVersionExtension.dll + WixFileVersionExtension + + + $(WixExtDir)\WixNetFxExtension.dll + WixNetFxExtension + @@ -30,8 +56,19 @@ INSTALLFOLDER - + + + + + \ No newline at end of file diff --git a/Bootstrapper/Bundle.wxs b/Bootstrapper/Bundle.wxs index 5afbc5e..3cbcc74 100644 --- a/Bootstrapper/Bundle.wxs +++ b/Bootstrapper/Bundle.wxs @@ -1,10 +1,11 @@ - + - - - - + + + + + - - - + - + LaunchPassive="yes" + LaunchQuiet="yes" + LaunchTarget="[LocalAppDataFolder]$(var.ProductName)\FeedCenter.exe" /> + - - + - - + + + + + \ No newline at end of file diff --git a/Setup/Product.wxs b/Setup/Product.wxs index 5520622..e8633fb 100644 --- a/Setup/Product.wxs +++ b/Setup/Product.wxs @@ -1,17 +1,23 @@ - + - - - - + + + + + - + UpgradeCode="47f30e4a-a861-47ac-b82d-35e4b886992a"> + + + + - + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + @@ -60,12 +74,13 @@ - + + @@ -80,18 +95,19 @@ - + - + + @@ -106,8 +122,8 @@ - + + Source="$(var.FeedCenter.TargetDir)\runtimes\win-x86\native\realm-wrappers.dll" /> + Source="$(var.FeedCenter.TargetDir)\runtimes\win-x86\native\sni.dll" /> - + + - + + + + + Debug + x86 3.9 + dfb3fe30-18ea-4216-8d92-11df9c8d50f1 + 2.0 + Setup + Package + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + bin\$(Configuration)\ + obj\$(Configuration)\ Debug ICE91 + bin\$(Configuration)\ + obj\$(Configuration)\ ICE91 true - + + + + + ..\packages\WixFileVersionExtension.1.0.0.3\lib\WixFileVersionExtension.dll + WixFileVersionExtension + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + $(WixExtDir)\WixNetFxExtension.dll + WixNetFxExtension + @@ -25,4 +52,16 @@ INSTALLFOLDER + + + + + \ No newline at end of file diff --git a/Setup/packages.config b/Setup/packages.config new file mode 100644 index 0000000..6dadc06 --- /dev/null +++ b/Setup/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file