Merge pull request #2 from FuseCP-TRobinson/master

Fixes to build
FuseCP · Jan 26, 2023 · dece52d · dece52d
2 parents c0c957e + 29eed04
commit dece52d
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 30 deletions.
diff --git a/SolidCP.Installer/Sources/SolidCP.Installer.Core/Properties/Settings.Designer.cs b/SolidCP.Installer/Sources/SolidCP.Installer.Core/Properties/Settings.Designer.cs
diff --git a/...dCP.Installer/Sources/SolidCP.Installer.Core/Web References/InstallerService/Reference.cs b/...dCP.Installer/Sources/SolidCP.Installer.Core/Web References/InstallerService/Reference.cs
@@ -1,30 +1,62 @@
-//------------------------------------------------------------------------------
+// Copyright (c) 2016, SolidCP
+// SolidCP is distributed under the Creative Commons Share-alike license
+// 
+// SolidCP is a fork of WebsitePanel:
+// Copyright (c) 2015, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.1.
 // 
 #pragma warning disable 1591
 
-namespace SolidCP.Installer.Core.InstallerService {
-    using System.Diagnostics;
+namespace SolidCP.Installer.Services {
     using System;
-    using System.Xml.Serialization;
-    using System.ComponentModel;
-    using System.Web.Services.Protocols;
     using System.Web.Services;
+    using System.Diagnostics;
+    using System.Web.Services.Protocols;
+    using System.ComponentModel;
+    using System.Xml.Serialization;
     using System.Data;
 
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="InstallerServiceSoap", Namespace="http://installer.solidcp.com/services")]
@@ -299,11 +331,11 @@ private bool IsLocalFileSystemWebService(string url) {
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     public delegate void GetReleaseFileInfoCompletedEventHandler(object sender, GetReleaseFileInfoCompletedEventArgs e);
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetReleaseFileInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -325,11 +357,11 @@ public System.Data.DataSet Result {
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     public delegate void GetFileChunkCompletedEventHandler(object sender, GetFileChunkCompletedEventArgs e);
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetFileChunkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -351,11 +383,11 @@ public byte[] Result {
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     public delegate void GetFileSizeCompletedEventHandler(object sender, GetFileSizeCompletedEventArgs e);
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetFileSizeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -377,11 +409,11 @@ public long Result {
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     public delegate void GetAvailableComponentsCompletedEventHandler(object sender, GetAvailableComponentsCompletedEventArgs e);
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetAvailableComponentsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -403,11 +435,11 @@ public System.Data.DataSet Result {
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     public delegate void GetLatestComponentUpdateCompletedEventHandler(object sender, GetLatestComponentUpdateCompletedEventArgs e);
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetLatestComponentUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -429,11 +461,11 @@ public System.Data.DataSet Result {
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     public delegate void GetComponentUpdateCompletedEventHandler(object sender, GetComponentUpdateCompletedEventArgs e);
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetComponentUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -455,4 +487,4 @@ public System.Data.DataSet Result {
     }
 }
 
-#pragma warning restore 1591
+#pragma warning restore 1591
diff --git a/SolidCP.Installer/Sources/SolidCP.Installer/ApplicationForm.cs b/SolidCP.Installer/Sources/SolidCP.Installer/ApplicationForm.cs
@@ -224,7 +224,7 @@ private void PopulateResultView(ScopeNode parentNode)
 				control.Dock = DockStyle.Fill;
 				try
 				{
-					AppContext context = new AppContext();
+					SCPAppContext context = new SCPAppContext();
 					context.AppForm = this;
 					context.ScopeNode = parentNode;
 					control.ShowControl(context);

diff --git a/SolidCP.Installer/Sources/SolidCP.Installer/Common/AppContext.cs b/SolidCP.Installer/Sources/SolidCP.Installer/Common/AppContext.cs
@@ -36,7 +36,7 @@
 
 namespace SolidCP.Installer.Common
 {
-	internal class AppContext
+	internal class SCPAppContext
 	{
 		private ApplicationForm appForm;
 		private ScopeNode scopeNode;

diff --git a/SolidCP.Installer/Sources/SolidCP.Installer/Controls/ComponentControl.cs b/SolidCP.Installer/Sources/SolidCP.Installer/Controls/ComponentControl.cs
@@ -67,7 +67,7 @@ public ComponentControl()
 		/// Shows control
 		/// </summary>
 		/// <param name="context"></param>
-		public override void ShowControl(AppContext context)
+		public override void ShowControl(SCPAppContext context)
 		{
 			base.ShowControl(context);
 			if (!IsInitialized)

diff --git a/SolidCP.Installer/Sources/SolidCP.Installer/Controls/ResultViewControl.cs b/SolidCP.Installer/Sources/SolidCP.Installer/Controls/ResultViewControl.cs
@@ -38,10 +38,10 @@ namespace SolidCP.Installer.Controls
 {
 	internal class ResultViewControl : UserControl
 	{
-		private AppContext appContext;
+		private SCPAppContext appContext;
 		private bool isInitialized;
 
-		public AppContext AppContext
+		public SCPAppContext AppContext
 		{
 			get { return appContext; }
 			set { appContext = value; }
@@ -53,7 +53,7 @@ protected bool IsInitialized
 			set { isInitialized = value; }
 		}
 
-		public virtual void ShowControl(AppContext context)
+		public virtual void ShowControl(SCPAppContext context)
 		{
 			this.AppContext = context;
 		}

diff --git a/SolidCP.Installer/Sources/SolidCP.Installer/Controls/SettingsControl.cs b/SolidCP.Installer/Sources/SolidCP.Installer/Controls/SettingsControl.cs
@@ -65,7 +65,7 @@ public SettingsControl()
 		/// Shows control
 		/// </summary>
 		/// <param name="context"></param>
-		public override void ShowControl(AppContext context)
+		public override void ShowControl(SCPAppContext context)
 		{
 			base.ShowControl(context);
 			if (!IsInitialized)