Merge

WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer20.cs

@@ -6,6 +6,36 @@ using WebsitePanel.Setup.Actions;
 
 namespace WebsitePanel.Setup
 {
+    /// <summary>
+    /// Release 2.1.0
+    /// </summary>
+    public class EnterpriseServer210 : 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: "2.0.0,2.1.0",
+                updateSql: true);
+        }
+    }
+
     /// <summary>
     /// Release 2.0.0
     /// </summary>

WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal20.cs

@@ -6,6 +6,36 @@ using WebsitePanel.Setup.Actions;
 
 namespace WebsitePanel.Setup
 {
+    /// <summary>
+    /// Release 2.1.0
+    /// </summary>
+    public class Portal210 : 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: "2.0.0,2.1.0",
+                updateSql: false);
+        }
+    }
+
     /// <summary>
     /// Release 2.0.0
     /// </summary>

WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server20.cs

@@ -5,6 +5,36 @@ using System.Text;
 
 namespace WebsitePanel.Setup
 {
+    /// <summary>
+    /// Release 2.1.0
+    /// </summary>
+    public class Server210 : 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: "2.0.0,2.1.0",
+                updateSql: false);
+        }
+    }
+
     /// <summary>
     /// Release 2.0.0
     /// </summary>

WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup20.cs

@@ -5,6 +5,17 @@ using System.Windows.Forms;
 
 namespace WebsitePanel.Setup
 {
+    /// <summary>
+    /// Release 2.1.0
+    /// </summary>
+    public class StandaloneServerSetup210 : StandaloneServerSetup
+    {
+        public static new object Install(object obj)
+        {
+            return StandaloneServerSetup.InstallBase(obj, minimalInstallerVersion: "2.0.0");
+        }
+    }
+
     /// <summary>
     /// Release 2.0.0
     /// </summary>

WebsitePanel/Sources/VersionInfo.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -15,8 +15,8 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyCompany("Outercurve Foundation")]
 [assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
-[assembly: AssemblyVersion("2.0.0.1")]
-[assembly: AssemblyFileVersion("2.0.0.1")]
-[assembly: AssemblyInformationalVersion("2.0.0")]
+[assembly: AssemblyVersion("2.1.0.1")]
+[assembly: AssemblyFileVersion("2.1.0.1")]
+[assembly: AssemblyInformationalVersion("2.1.0")]
 
 

WebsitePanel/Sources/VersionInfo.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.17929
+'     Runtime Version:4.0.30319.18010
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -15,9 +15,9 @@ Imports System
 Imports System.Reflection
 Imports System.Runtime.CompilerServices
 Imports System.Runtime.InteropServices
-<Assembly: AssemblyCompany("Outercurve Foundation"), _
- Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
- Assembly: AssemblyVersion("2.0.0.1"), _
- Assembly: AssemblyFileVersion("2.0.0.1"), _
- Assembly: AssemblyInformationalVersion("2.0.0")> 
+<Assembly: AssemblyCompany("Outercurve Foundation"),  _
+ Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."),  _
+ Assembly: AssemblyVersion("2.1.0.1"),  _
+ Assembly: AssemblyFileVersion("2.1.0.1"),  _
+ Assembly: AssemblyInformationalVersion("2.1.0")>