From f90a95ea68aa65524cf6fcc90f10a89580779cf6 Mon Sep 17 00:00:00 2001
From: feodor_fitsner <devnull@localhost>
Date: Thu, 13 Sep 2012 12:26:22 -0700
Subject: [PATCH] Added 2.0.0 setup logic

---
 .../WebsitePanel.Installer/Updater.exe        | Bin 199168 -> 199168 bytes
 .../WebsitePanel.Setup/EnterpriseServer10.cs  |  26 ------------
 .../WebsitePanel.Setup/EnterpriseServer20.cs  |  38 ++++++++++++++++++
 .../Sources/WebsitePanel.Setup/Portal10.cs    |  27 -------------
 .../Sources/WebsitePanel.Setup/Portal20.cs    |  38 ++++++++++++++++++
 .../Sources/WebsitePanel.Setup/Server10.cs    |  27 -------------
 .../Sources/WebsitePanel.Setup/Server20.cs    |  37 +++++++++++++++++
 .../StandaloneServerSetup10.cs                |  12 ------
 .../StandaloneServerSetup20.cs                |  18 +++++++++
 .../WebsitePanel.Setup.csproj                 |   4 ++
 10 files changed, 135 insertions(+), 92 deletions(-)
 create mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer20.cs
 create mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal20.cs
 create mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server20.cs
 create mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup20.cs

diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index d0cbdc57dca50e743d33260c87162f953f881f08..2d19e85867693a3cb0a545cbfe61f85712a56004 100644
GIT binary patch
delta 45
zcmV+|0Mh?}lnj8B43LNe*11uEi-n5;wTl9cbP!BA@I_)CyF;P6NqNe(Ng=l=bpqIw
Dy~`7<

delta 45
zcmZpe!qYH?XF><F&Nbi0?$&O`t=&w$B?9X%SDk(9((SR4F(WPboDtJ@jZ&r?Qvkc4
B6Mg^y

diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer10.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer10.cs
index dd90ac25..debbff1d 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer10.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer10.cs
@@ -7,32 +7,6 @@ using WebsitePanel.Setup.Actions;
 namespace WebsitePanel.Setup
 
 {
-    /// <summary>
-    /// Release 1.2.2
-    /// </summary>
-    public class EnterpriseServer122 : EnterpriseServer
-    {
-        public static new object Install(object obj)
-        {
-            //
-            return EnterpriseServer.InstallBase(obj, "1.2.2");
-        }
-
-        public static new DialogResult Uninstall(object obj)
-        {
-            return EnterpriseServer.Uninstall(obj);
-        }
-
-        public static new DialogResult Setup(object obj)
-        {
-            return EnterpriseServer.Setup(obj);
-        }
-
-        public static new DialogResult Update(object obj)
-        {
-            return UpdateBase(obj, "1.2.2", "1.2.1", true);
-        }
-    }
     /// <summary>
     /// Release 1.2.1
     /// </summary>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer20.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer20.cs
new file mode 100644
index 00000000..c8df0677
--- /dev/null
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer20.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using WebsitePanel.Setup.Actions;
+
+namespace WebsitePanel.Setup
+{
+    /// <summary>
+    /// Release 2.0.0
+    /// </summary>
+    public class EnterpriseServer200 : EnterpriseServer
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return EnterpriseServer.InstallBase(obj, minimalInstallerVersion: "2.0.0");
+        }
+
+        public static new DialogResult Uninstall(object obj)
+        {
+            return EnterpriseServer.Uninstall(obj);
+        }
+
+        public static new DialogResult Setup(object obj)
+        {
+            return EnterpriseServer.Setup(obj);
+        }
+
+        public static new DialogResult Update(object obj)
+        {
+            return UpdateBase(obj,
+                minimalInstallerVersion: "2.0.0",
+                versionToUpgrade: "1.2.1",
+                updateSql: true);
+        }
+    }
+}
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal10.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal10.cs
index 3818b293..01854e9b 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal10.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal10.cs
@@ -6,33 +6,6 @@ using WebsitePanel.Setup.Actions;
 
 namespace WebsitePanel.Setup
 {
-    /// <summary>
-    /// Release 1.2.2
-    /// </summary>
-    public class Portal122 : Portal
-    {
-        public static new object Install(object obj)
-        {
-            //
-            return Portal.InstallBase(obj, "1.2.2");
-        }
-
-        public static new DialogResult Uninstall(object obj)
-        {
-            return Portal.Uninstall(obj);
-        }
-
-        public static new DialogResult Setup(object obj)
-        {
-            return Portal.Setup(obj);
-        }
-
-        public static new DialogResult Update(object obj)
-        {
-            return UpdateBase(obj, "1.2.2", "1.2.1", false);
-        }
-    }
-
     /// <summary>
     /// Release 1.2.1
     /// </summary>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal20.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal20.cs
new file mode 100644
index 00000000..2419d5dc
--- /dev/null
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal20.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using WebsitePanel.Setup.Actions;
+
+namespace WebsitePanel.Setup
+{
+    /// <summary>
+    /// Release 2.0.0
+    /// </summary>
+    public class Portal200 : Portal
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return Portal.InstallBase(obj, minimalInstallerVersion: "2.0.0");
+        }
+
+        public static new DialogResult Uninstall(object obj)
+        {
+            return Portal.Uninstall(obj);
+        }
+
+        public static new DialogResult Setup(object obj)
+        {
+            return Portal.Setup(obj);
+        }
+
+        public static new DialogResult Update(object obj)
+        {
+            return UpdateBase(obj,
+                minimalInstallerVersion: "2.0.0",
+                versionToUpgrade: "1.2.1",
+                updateSql: false);
+        }
+    }
+}
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server10.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server10.cs
index b5d08705..bd63cb57 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server10.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server10.cs
@@ -6,33 +6,6 @@ using WebsitePanel.Setup.Actions;
 
 namespace WebsitePanel.Setup
 {
-    /// <summary>
-    /// Release 1.2.2
-    /// </summary>
-    public class Server122 : Server
-    {
-        public static new object Install(object obj)
-        {
-            //
-            return Server.InstallBase(obj, "1.2.2");
-        }
-
-        public static new object Uninstall(object obj)
-        {
-            return Server.Uninstall(obj);
-        }
-
-        public static new object Setup(object obj)
-        {
-            return Server.Setup(obj);
-        }
-
-        public static new object Update(object obj)
-        {
-            return Server.UpdateBase(obj, "1.2.2", "1.2.1", false);
-        }
-    }
-
     /// <summary>
     /// Release 1.2.1
     /// </summary>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server20.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server20.cs
new file mode 100644
index 00000000..9f0a7988
--- /dev/null
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server20.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WebsitePanel.Setup
+{
+    /// <summary>
+    /// Release 2.0.0
+    /// </summary>
+    public class Server200 : Server
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return Server.InstallBase(obj, minimalInstallerVersion: "2.0.0");
+        }
+
+        public static new object Uninstall(object obj)
+        {
+            return Server.Uninstall(obj);
+        }
+
+        public static new object Setup(object obj)
+        {
+            return Server.Setup(obj);
+        }
+
+        public static new object Update(object obj)
+        {
+            return Server.UpdateBase(obj,
+                minimalInstallerVersion: "2.0.0",
+                versionToUpgrade: "1.2.1",
+                updateSql: false);
+        }
+    }
+}
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup10.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup10.cs
index 24bd0e0d..116f45c2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup10.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup10.cs
@@ -5,18 +5,6 @@ using System.Windows.Forms;
 
 namespace WebsitePanel.Setup
 {
-    /// <summary>
-    /// Release 1.2.2
-    /// </summary>
-    public class StandaloneServerSetup122 : StandaloneServerSetup
-    {
-        public static new object Install(object obj)
-        {
-            return StandaloneServerSetup.InstallBase(obj, "1.2.2");
-        }
-    }
-
-
     /// <summary>
     /// Release 1.2.1
     /// </summary>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup20.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup20.cs
new file mode 100644
index 00000000..ff7d0cec
--- /dev/null
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup20.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+
+namespace WebsitePanel.Setup
+{
+    /// <summary>
+    /// Release 2.0.0
+    /// </summary>
+    public class StandaloneServerSetup200 : StandaloneServerSetup
+    {
+        public static new object Install(object obj)
+        {
+            return StandaloneServerSetup.InstallBase(obj, minimalInstallerVersion: "2.0.0");
+        }
+    }
+}
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/WebsitePanel.Setup.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/WebsitePanel.Setup.csproj
index f9e793ad..3ce91c9d 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/WebsitePanel.Setup.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/WebsitePanel.Setup.csproj
@@ -140,8 +140,11 @@
     <Compile Include="Common\XmlUtils.cs" />
     <Compile Include="Common\ZipIndicator.cs" />
     <Compile Include="EnterpriseServer10.cs" />
+    <Compile Include="EnterpriseServer20.cs" />
     <Compile Include="Portal10.cs" />
+    <Compile Include="Portal20.cs" />
     <Compile Include="Server10.cs" />
+    <Compile Include="Server20.cs" />
     <Compile Include="StandaloneServerSetup.cs" />
     <Compile Include="EnterpriseServer.cs" />
     <Compile Include="Portal.cs" />
@@ -160,6 +163,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="StandaloneServerSetup10.cs" />
+    <Compile Include="StandaloneServerSetup20.cs" />
     <Compile Include="Web\AspNetVersion.cs" />
     <Compile Include="Web\ServerBinding.cs" />
     <Compile Include="Web\ServerState.cs" />