Merge pull request #2 from FuseCP/master

merge
FuseCP · Oct 23, 2019 · dbabc67 · dbabc67
2 parents 642917b + b78c59e
commit dbabc67
Show file tree

Hide file tree

Showing 19 changed files with 423 additions and 76 deletions.
diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/EnterpriseServer10.cs b/SolidCP.Installer/Sources/SolidCP.Setup/EnterpriseServer10.cs
@@ -39,6 +39,35 @@
 namespace SolidCP.Setup
 
 {
+    /// <summary>
+    /// Release 1.4.5
+    /// </summary>
+    public class EnterpriseServer145 : EnterpriseServer
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return EnterpriseServer.InstallBase(obj, "1.0.1");
+        }
+
+        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: "1.0.1",
+                 versionToUpgrade: "1.4.4,1.4.3",
+                 updateSql: true);
+        }
+    }
     /// <summary>
     /// Release 1.4.4
     /// </summary>

diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/Portal10.cs b/SolidCP.Installer/Sources/SolidCP.Setup/Portal10.cs
@@ -38,6 +38,35 @@
 
 namespace SolidCP.Setup
 {
+    /// <summary>
+    /// Release 1.4.5
+    /// </summary>
+    public class Portal145 : Portal
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return Portal.InstallBase(obj, "1.4.4");
+        }
+
+        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: "1.0.1",
+                versionToUpgrade: "1.4.4,1.4.3",
+                updateSql: false);
+        }
+    }
     /// <summary>
     /// Release 1.4.4
     /// </summary>

diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/Server10.cs b/SolidCP.Installer/Sources/SolidCP.Setup/Server10.cs
@@ -38,6 +38,35 @@
 
 namespace SolidCP.Setup
 {
+    /// <summary>
+    /// Release 1.4.5
+    /// </summary>
+    public class Server145 : Server
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return Server.InstallBase(obj, "1.0.1");
+        }
+
+        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: "1.0.1",
+                 versionToUpgrade: "1.4.4,1.4.3",
+                 updateSql: false);
+        }
+    }
     /// <summary>
     /// Release 1.4.4
     /// </summary>

diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/Serveraspv210.cs b/SolidCP.Installer/Sources/SolidCP.Setup/Serveraspv210.cs
@@ -38,6 +38,35 @@
 
 namespace SolidCP.Setup
 {
+    /// <summary>
+    /// Release 1.4.5
+    /// </summary>
+    public class Serveraspv2145 : Server
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return Server.InstallBase(obj, "1.0.1");
+        }
+
+        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: "1.0.1",
+                 versionToUpgrade: "1.4.4,1.4.3",
+                 updateSql: false);
+        }
+    }
     /// <summary>
     /// Release 1.4.4
     /// </summary>

diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/StandaloneServerSetup10.cs b/SolidCP.Installer/Sources/SolidCP.Setup/StandaloneServerSetup10.cs
@@ -37,6 +37,16 @@
 
 namespace SolidCP.Setup
 {
+    /// <summary>
+    /// Release 1.4.5
+    /// </summary>
+    public class StandaloneServerSetup145 : StandaloneServerSetup
+    {
+        public static new object Install(object obj)
+        {
+            return StandaloneServerSetup.InstallBase(obj, "1.0.1");
+        }
+    }
     /// <summary>
     /// Release 1.4.4
     /// </summary>

diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/WebDavPortal10.cs b/SolidCP.Installer/Sources/SolidCP.Setup/WebDavPortal10.cs
@@ -37,7 +37,36 @@
 using SolidCP.Setup.Actions;
 
 namespace SolidCP.Setup
-{
+{
+    /// <summary>
+    /// Release 1.4.5
+    /// </summary>
+    public class WebDavPortal145 : WebDavPortal
+    {
+        public static new object Install(object obj)
+        {
+            //
+            return WebDavPortal.InstallBase(obj, "1.0.1");
+        }
+
+        public static new object Uninstall(object obj)
+        {
+            return WebDavPortal.Uninstall(obj);
+        }
+
+        public static new object Setup(object obj)
+        {
+            return WebDavPortal.Setup(obj);
+        }
+
+        public static new object Update(object obj)
+        {
+            return WebDavPortal.UpdateBase(obj,
+                minimalInstallerVersion: "1.0.1",
+                versionToUpgrade: "1.4.4,1.4.3",
+                updateSql: false);
+        }
+    }
     /// <summary>
     /// Release 1.4.4
     /// </summary>

diff --git a/SolidCP.Installer/Sources/VersionInfo.cs b/SolidCP.Installer/Sources/VersionInfo.cs
@@ -1,22 +1,22 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyCompany("SolidCP")]
-[assembly: AssemblyCopyright("Copyright © 2019 SolidCP.")]
-[assembly: AssemblyVersion("1.4.4")]
-[assembly: AssemblyFileVersion("1.4.4")]
-[assembly: AssemblyInformationalVersion("1.4.4")]
-
-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyCompany("SolidCP")]
+[assembly: AssemblyCopyright("Copyright © 2019 SolidCP.")]
+[assembly: AssemblyVersion("1.4.5")]
+[assembly: AssemblyFileVersion("1.4.5")]
+[assembly: AssemblyInformationalVersion("1.4.5")]
+
+
diff --git a/SolidCP.WebSite/Sources/SolidCP.WebSite/Data/ProductReleasesFeed.Beta.xml b/SolidCP.WebSite/Sources/SolidCP.WebSite/Data/ProductReleasesFeed.Beta.xml
@@ -7,6 +7,13 @@
   <component application="SolidCP" name="Standalone Server Setup" code="standalone">
     <description>Express setup for standalone server configuration. It installs Portal, Enterprise, and Server components on the same server and configures SolidCP using sample settings.</description>
     <releases>
+    	<release version="1.4.5" date="17/10/2019" available="true" beta="false">
+        <releaseFileID>145</releaseFileID>
+        <fullFilePath>~/Files/1.4.5/SolidCP-StandaloneServerSetup.zip</fullFilePath>
+        <upgradeFilePath></upgradeFilePath>
+        <installerPath>setup\setup.dll</installerPath>
+        <installerType>SolidCP.Setup.StandaloneServerSetup145</installerType>
+      </release>
        <release version="1.4.4" date="02/09/2019" available="true" beta="false">
         <releaseFileID>144</releaseFileID>
         <fullFilePath>~/Files/1.4.4/SolidCP-StandaloneServerSetup.zip</fullFilePath>
@@ -112,6 +119,13 @@
   <component application="SolidCP" name="Portal" code="portal">
     <description>SolidCP Portal is a user interface to the control panel which allows managing user accounts, hosting spaces, web sites, FTP accounts, files, etc.</description>
     <releases>
+    	<release version="1.4.5" date="17/10/2019" available="true" beta="false">
+        <releaseFileID>245</releaseFileID>
+        <fullFilePath>~/Files/1.4.5/SolidCP-Portal.zip</fullFilePath>
+        <upgradeFilePath>~/Files/1.4.5/SolidCP-Portal-Update.zip</upgradeFilePath>
+        <installerPath>setup\setup.dll</installerPath>
+        <installerType>SolidCP.Setup.Portal145</installerType>
+      </release>
        <release version="1.4.4" date="02/09/2019" available="true" beta="false">
         <releaseFileID>244</releaseFileID>
         <fullFilePath>~/Files/1.4.4/SolidCP-Portal.zip</fullFilePath>
@@ -217,6 +231,13 @@
   <component application="SolidCP" name="Enterprise Server" code="enterprise server">
     <description>Enterprise Server is the core of SolidCP system. It includes all business logic of the application. Enterprise Server should have access to Server and be accessible from Portal applications.</description>
     <releases>
+       <release version="1.4.5" date="17/10/2019" available="true" beta="false">
+        <releaseFileID>345</releaseFileID>
+        <fullFilePath>~/Files/1.4.5/SolidCP-EnterpriseServer.zip</fullFilePath>
+        <upgradeFilePath>~/Files/1.4.5/SolidCP-EnterpriseServer-Update.zip</upgradeFilePath>
+        <installerPath>setup\setup.dll</installerPath>
+        <installerType>SolidCP.Setup.EnterpriseServer145</installerType>
+       </release>
        <release version="1.4.4" date="02/09/2019" available="true" beta="false">
         <releaseFileID>344</releaseFileID>
         <fullFilePath>~/Files/1.4.4/SolidCP-EnterpriseServer.zip</fullFilePath>
@@ -322,6 +343,13 @@
   <component application="SolidCP" name="Server asp.net v4.5" code="server">
     <description>SolidCP Server is a set of services running on the remote server to be controlled. Server application should be reachable from Enterprise Server one.</description>
     <releases>
+       <release version="1.4.5" date="17/10/2019" available="true" beta="false">
+        <releaseFileID>445</releaseFileID>
+        <fullFilePath>~/Files/1.4.5/SolidCP-Server.zip</fullFilePath>
+        <upgradeFilePath>~/Files/1.4.5/SolidCP-Server-Update.zip</upgradeFilePath>
+        <installerPath>setup\setup.dll</installerPath>
+        <installerType>SolidCP.Setup.Server145</installerType>
+      </release>
       <release version="1.4.4" date="02/09/2019" available="true" beta="false">
         <releaseFileID>444</releaseFileID>
         <fullFilePath>~/Files/1.4.4/SolidCP-Server.zip</fullFilePath>
@@ -427,6 +455,13 @@
   <component application="SolidCP" name="Server asp.net v2.0" code="serveraspv2">
     <description>SolidCP Server asp.net 2.0 is a SolidCP Server module for Exchange 2010. It has limited functionality mainly aimed to support software that can not run on asp.net 4.5 (like exchange 2010).</description>
     <releases>
+       <release version="1.4.5" date="17/10/2019" available="true" beta="false">
+        <releaseFileID>645</releaseFileID>
+        <fullFilePath>~/Files/1.4.5/SolidCP-Server-asp-v2.zip</fullFilePath>
+        <upgradeFilePath>~/Files/1.4.5/SolidCP-Server-asp-v2-Update.zip</upgradeFilePath>
+        <installerPath>setup\setup.dll</installerPath>
+        <installerType>SolidCP.Setup.Serveraspv2145</installerType>
+      </release>
        <release version="1.4.4" date="02/09/2019" available="true" beta="false">
         <releaseFileID>644</releaseFileID>
         <fullFilePath>~/Files/1.4.4/SolidCP-Server-asp-v2.zip</fullFilePath>
@@ -489,6 +524,13 @@
   <component application="SolidCP" name="Cloud Storage Portal" code="WebDavPortal">
     <description>SolidCP Cloud Storage Portal is a client frontend for viewing and editing their Cloud (WebDav) storage files.</description>
     <releases>
+       <release version="1.4.5" date="17/10/2019" available="true" beta="false">
+        <releaseFileID>545</releaseFileID>
+        <fullFilePath>~/Files/1.4.5/SolidCP-Web-Dav-Portal.zip</fullFilePath>
+        <upgradeFilePath>~/Files/1.4.5/SolidCP-Web-Dav-Portal.zip</upgradeFilePath>
+        <installerPath>setup\setup.dll</installerPath>
+        <installerType>SolidCP.Setup.WebDavPortal145</installerType>
+      </release>
       <release version="1.4.4" date="02/09/2019" available="true" beta="false">
         <releaseFileID>544</releaseFileID>
         <fullFilePath>~/Files/1.4.4/SolidCP-Web-Dav-Portal.zip</fullFilePath>