From 8ef4a0fced68e9a201d9135c0bb606120babe377 Mon Sep 17 00:00:00 2001 From: Colin Dawson Date: Thu, 29 Oct 2026 12:36:27 +0000 Subject: [PATCH] Upgraded the wix installed to use Wix 7 --- Meade.net.Setup/AscomFocuserDriver.wxs | 5 +- Meade.net.Setup/AscomLocalServer.wxs | 12 ++-- Meade.net.Setup/AscomTelescopeDriver.wxs | 5 +- Meade.net.Setup/Directories.wxs | 14 ++--- Meade.net.Setup/FeatureTree.wxs | 4 +- Meade.net.Setup/InstallationUI.wxs | 42 ++++++------- Meade.net.Setup/Meade.net.Setup.wixproj | 67 +++----------------- Meade.net.Setup/Product.wxs | 79 ++++++++++++------------ 8 files changed, 86 insertions(+), 142 deletions(-) diff --git a/Meade.net.Setup/AscomFocuserDriver.wxs b/Meade.net.Setup/AscomFocuserDriver.wxs index 84136ec..35c8b4b 100644 --- a/Meade.net.Setup/AscomFocuserDriver.wxs +++ b/Meade.net.Setup/AscomFocuserDriver.wxs @@ -1,6 +1,6 @@ - + - + @@ -44,34 +44,32 @@ Patch dialog sequence: - 1 - "1"]]> + + - 1 + - NOT Installed - Installed AND PATCH + + - 1 - LicenseAccepted = "1" + + - 1 - 1 - NOT WIXUI_DONTVALIDATEPATH - "1"]]> - WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" - 1 - 1 + + + + + - NOT Installed - Installed AND NOT PATCH - Installed AND PATCH + + + - 1 + - 1 - 1 - 1 + + + diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj index a02f724..6fd2bcd 100644 --- a/Meade.net.Setup/Meade.net.Setup.wixproj +++ b/Meade.net.Setup/Meade.net.Setup.wixproj @@ -1,55 +1,19 @@ - + - Debug - x86 - 3.10 - 8eeb5c25-8394-4257-8e57-cded47cb6f1b - 2.0 - Meade.net.Setup Package + x86 + Meade.net.Setup - - bin\$(Platform)\$(Configuration)\ - obj\$(Configuration)\ + + Debug - - bin\$(Configuration)\ - obj\$(Configuration)\ - - - Debug - bin\$(Configuration)\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - + - - - - - - - - - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - - - + + Meade.net.focuser @@ -76,17 +40,4 @@ INSTALLFOLDER - - - - - - - \ No newline at end of file + diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs index 83a573a..909e219 100644 --- a/Meade.net.Setup/Product.wxs +++ b/Meade.net.Setup/Product.wxs @@ -1,48 +1,51 @@ - + - - + + - + - + + + - - - + - - = "6.6.0"]]> - + + + + - - - = "#528040")]]> - + - + + + - - - - - - - + +