Merge pull request #376 from raisingthefloor/master

Morphic for Windows v1.8
raisingthefloor · Nov 17, 2023 · 85cb25c · 85cb25c
2 parents d8d016f + c14e654
commit 85cb25c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Morphic.Client/App.xaml.cs b/Morphic.Client/App.xaml.cs
@@ -1415,7 +1415,7 @@ internal static bool WasInstalledUsingEnterpriseInstaller()
                case "morphicmsi":
                     return false;
                case "morphicenterprisemsi":
-                    return false;
+                    return true;
                default:
                     Debug.Assert(false, "Registry value 'setupPackageVariant' contains unrecognized string data");
                     // default to "not installed with enterprise installer"

diff --git a/Morphic.Setup.Enterprise/Product.wxs b/Morphic.Setup.Enterprise/Product.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-	<Package Name="Morphic" Language="1033" Version="!(bind.FileVersion.filFa4krMwL6ueyj_tX_uB0JUHWusc)" Manufacturer="Raising the Floor" UpgradeCode="7d0ee114-79e8-4ff6-b28b-0408551483f5" InstallerVersion="200" Scope="perMachine">
+	<Package Name="Morphic" Language="1033" Version="!(bind.FileVersion.filFa4krMwL6ueyj_tX_uB0JUHWusc)" Manufacturer="Raising the Floor" UpgradeCode="7d0ee114-79e8-4ff6-b28b-0408551483f5" InstallerVersion="500" Scope="perMachine">
 
 		<Icon Id="MorphicIcon" SourceFile="$(var.Morphic.Client.ProjectDir)\Icon.ico" />
 		<Property Id="ARPPRODUCTICON" Value="MorphicIcon" />

diff --git a/Morphic.Setup/Product.wxs b/Morphic.Setup/Product.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-	<Package Name="Morphic" Language="1033" Version="!(bind.FileVersion.filFa4krMwL6ueyj_tX_uB0JUHWusc)" Manufacturer="Raising the Floor" UpgradeCode="7d0ee114-79e8-4ff6-b28b-0408551483f5" InstallerVersion="200">
+	<Package Name="Morphic" Language="1033" Version="!(bind.FileVersion.filFa4krMwL6ueyj_tX_uB0JUHWusc)" Manufacturer="Raising the Floor" UpgradeCode="7d0ee114-79e8-4ff6-b28b-0408551483f5" InstallerVersion="500">
 
 		<Icon Id="MorphicIcon" SourceFile="$(var.Morphic.Client.ProjectDir)\Icon.ico" />
 		<Property Id="ARPPRODUCTICON" Value="MorphicIcon" />