From aef44beb2234520590f63a63d11211ce3fb4dd55 Mon Sep 17 00:00:00 2001 From: Christopher York Date: Fri, 4 Jan 2013 14:58:08 -0600 Subject: [PATCH 01/17] Fixed: Child account packages not suspending resulting in child services not being suspended with the parent. Fixed: Child account peer users were not being suspended when the parent is suspended. --- .../Code/Users/UserController.cs | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs index 14893de2..ff333445 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs @@ -678,6 +678,12 @@ namespace WebsitePanel.EnterpriseServer TaskManager.StartTask(taskId, "USER", "CHANGE_STATUS", user.Username); TaskManager.ItemId = user.UserId; + // update user packages + List packages = new List(); + + // Add the users package(s) + packages.AddRange(PackageController.GetPackages(userId)); + try { @@ -699,20 +705,24 @@ namespace WebsitePanel.EnterpriseServer List children = GetUsers(userId, true); foreach (UserInfo child in children) { - result = ChangeUserStatusInternal(child.UserId, status); - if (result < 0) - return result; + // Add the child users packages + packages.AddRange(PackageController.GetPackages(child.UserId)); + + // change child user peers + List childPeers = GetUserPeers(child.UserId); + foreach (UserInfo peer in childPeers) + { + result = ChangeUserStatusInternal(peer.UserId, status); + if (result < 0) + return result; + } + + // change child account + result = ChangeUserStatusInternal(child.UserId, status); + if (result < 0) + return result; } - // update user packages - List packages = new List(); - - // his packages - packages.AddRange(PackageController.GetMyPackages(userId)); - - // children packages - packages.AddRange(PackageController.GetPackages(userId)); - PackageStatus packageStatus = PackageStatus.Active; switch (status) { From dd13c67eaea3318204c5c22e29a3bdcfa6b7c9e2 Mon Sep 17 00:00:00 2001 From: ruslanht Date: Mon, 7 Jan 2013 12:20:22 +0200 Subject: [PATCH 02/17] Helicon Ape in IIS 7 settings fixed --- .../ProviderControls/IIS70_Settings.ascx.cs | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs index ba4737f3..a343dc3c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs @@ -157,7 +157,7 @@ namespace WebsitePanel.Portal.ProviderControls downloadApePanel.Visible = false; txtHeliconApeVersion.Text = sts.Version; lblHeliconRegistrationText.Text = sts.RegistrationInfo; - + if (sts.IsEnabled) { chkHeliconApeGlobalRegistration.Checked = true; @@ -171,7 +171,7 @@ namespace WebsitePanel.Portal.ProviderControls // Build url manually, EditUrl throws exception: module is Null // pid=Servers&mid=137&ctl=edit_platforminstaller&ServerID=1&Product=HeliconApe - List qsParts= new List(); + List qsParts = new List(); qsParts.Add("pid=Servers"); qsParts.Add("ctl=edit_platforminstaller"); @@ -180,6 +180,7 @@ namespace WebsitePanel.Portal.ProviderControls qsParts.Add("WPIProduct=HeliconApe"); InstallHeliconApeLink.Attributes["href"] = "Default.aspx?" + String.Join("&", qsParts.ToArray()); + ViewState["HeliconApeInitiallyEnabled"] = null; } // @@ -273,25 +274,23 @@ namespace WebsitePanel.Portal.ProviderControls ActiveDirectoryIntegration.SaveSettings(settings); + // Helicon Ape - bool registerHeliconApeGlobbally = chkHeliconApeGlobalRegistration.Checked; - - bool bHeliconApeInitiallyEnabled = false; - if (ViewState["HeliconApeInitiallyEnabled"] != null) - bHeliconApeInitiallyEnabled = (bool)ViewState["HeliconApeInitiallyEnabled"]; - - if (registerHeliconApeGlobbally != bHeliconApeInitiallyEnabled) + if (null != ViewState["HeliconApeInitiallyEnabled"]) { - if (registerHeliconApeGlobbally) + bool registerHeliconApeGlobbally = chkHeliconApeGlobalRegistration.Checked; + if (registerHeliconApeGlobbally != (bool)ViewState["HeliconApeInitiallyEnabled"]) { - ES.Services.WebServers.EnableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"])); - } - else - { - ES.Services.WebServers.DisableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"])); + if (registerHeliconApeGlobbally) + { + ES.Services.WebServers.EnableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"])); + } + else + { + ES.Services.WebServers.DisableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"])); + } } } - if (WDeployEnabledCheckBox.Checked) From 9e9f3f7b6245410cf202850ee8125f9ca88ea3cd Mon Sep 17 00:00:00 2001 From: ruslanht Date: Mon, 7 Jan 2013 12:26:01 +0200 Subject: [PATCH 03/17] Web App Gallery installer: bind db policies when database mode changed --- .../WebsitePanel/WebApplicationGalleryParams.ascx.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParams.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParams.ascx.cs index 1bfbb79a..0222ec36 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParams.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParams.ascx.cs @@ -334,7 +334,13 @@ namespace WebsitePanel.Portal protected void databaseMode_SelectedIndexChanged(object sender, EventArgs e) { - BindParameters(); + // load parameters + List parameters = GetApplicationParameters(); + if (parameters == null) + return; + + BindDBPolicies(parameters); + BindParameters(parameters); } private void BindParameters() From f208ce25221980588de073c1110307cd8781e3e3 Mon Sep 17 00:00:00 2001 From: ruslanht Date: Mon, 7 Jan 2013 12:44:14 +0200 Subject: [PATCH 04/17] Web App Gallery installer: validate mysql username length --- .../WebApplicationGalleryParamControl.ascx | 4 ++++ .../WebApplicationGalleryParamControl.ascx.cs | 24 +++++++++++++++++++ ...cationGalleryParamControl.ascx.designer.cs | 9 +++++++ 3 files changed, 37 insertions(+) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx index 4fd2dd72..6fe8e91b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx @@ -52,6 +52,10 @@ + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs index 6f0258ce..d2bd968b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs @@ -213,6 +213,15 @@ namespace WebsitePanel.Portal textValue.Text = DefaultValue; valPrefix.Text = ValuePrefix; valSuffix.Text = ValueSuffix; + + if ( + (WellKnownTags & DeploymentParameterWellKnownTag.MySql) == DeploymentParameterWellKnownTag.MySql + && + (WellKnownTags & DeploymentParameterWellKnownTag.DBUserName) == DeploymentParameterWellKnownTag.DBUserName + ) + { + MysqlUsernameLengthValidator.Enabled = true; + } } @@ -248,5 +257,20 @@ namespace WebsitePanel.Portal } + + protected void mysqlUsernameLen_OnServerValidate(object source, ServerValidateEventArgs args) + { + args.IsValid = true; + + // get entered database name with prefixes / suffixes + string value = GetParameterValue(); + + // check length + if (!string.IsNullOrEmpty(value) && value.Length <= 16) + return; + + // validation failed + args.IsValid = false; + } } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs index 28c270f4..1477051e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs @@ -165,6 +165,15 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.RegularExpressionValidator regexpTextValue; + /// + /// MysqlUsernameLengthValidator control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CustomValidator MysqlUsernameLengthValidator; + /// /// BooleanControl control. /// From 40b39a1469c9879cb094dda8476a5fe9348f92b2 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 7 Jan 2013 10:35:03 -0500 Subject: [PATCH 05/17] Merge --- .../WebApplicationGalleryParamControl.ascx.cs | 30 ++++++++++++++++++- ...cationGalleryParamControl.ascx.designer.cs | 30 ++++++++++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs index d2bd968b..fb4feb9c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.cs @@ -1,4 +1,32 @@ -using System; +// Copyright (c) 2012, 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. + +using System; using System.Collections.Generic; using System.Web; using System.Web.UI; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs index 1477051e..2a4bb091 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryParamControl.ascx.designer.cs @@ -1,4 +1,32 @@ -//------------------------------------------------------------------------------ +// Copyright (c) 2012, 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. + +//------------------------------------------------------------------------------ // // This code was generated by a tool. // From 90c560bd24648eeaff2d3c5d49c9ab60eefaa9e9 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 7 Jan 2013 10:50:57 -0500 Subject: [PATCH 06/17] Added tag build-2.0.0.233 for changeset 068f388d50d5 From 3c8419b4fa3a7a94d51b46d0a41ff8f1d5ae9c1f Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 7 Jan 2013 10:59:41 -0500 Subject: [PATCH 07/17] Added tag build-2.0.0.236 for changeset d19b8e0bb912 From 5595e608325153b2348477853681d7f535786ad1 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 7 Jan 2013 16:24:49 -0500 Subject: [PATCH 08/17] Added tag build-2.0.0.237 for changeset 3705e3ca89dc From 0c79b2cb032c8d30e9c08c465eee2ceb7e6741cb Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 7 Jan 2013 16:31:52 -0500 Subject: [PATCH 09/17] Added tag build-2.0.0.239 for changeset 3705e3ca89dc From 0e1a2bd8acba63fd381611c6140703c7fc1a6444 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 8 Jan 2013 11:13:50 -0500 Subject: [PATCH 10/17] Create new Installer Services to seperate product Feeds by Version. This will allow for prior versions to update properly. --- .../Properties/Settings.Designer.cs | 6 +-- .../Properties/Settings.settings | 2 +- .../ServiceProviderProxy.cs | 2 +- .../InstallerService/InstallerService-2.disco | 6 +++ ...erService.wsdl => InstallerService-2.wsdl} | 18 +++---- .../InstallerService/InstallerService.disco | 6 --- .../InstallerService/Reference.cs | 40 +++++++------- .../InstallerService/Reference.map | 4 +- .../WebsitePanel.Installer.Core.csproj | 13 +++-- .../WebsitePanel.Installer.Core/app.config | 2 +- .../Services/InstallerService-2.0.asmx | 1 + .../Services/InstallerService-2.0.asmx.cs | 53 +++++++++++++++++++ .../Services/InstallerService-2.1.asmx | 1 + .../Services/InstallerService-2.1.asmx.cs | 53 +++++++++++++++++++ .../WebsitePanel.WebSite.csproj | 8 +++ 15 files changed, 167 insertions(+), 48 deletions(-) create mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.disco rename WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/{InstallerService.wsdl => InstallerService-2.wsdl} (90%) delete mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco create mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx create mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs create mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx create mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs index 26d7262a..3f939f6c 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.269 +// Runtime Version:4.0.30319.18010 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace WebsitePanel.Installer.Core.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -26,7 +26,7 @@ namespace WebsitePanel.Installer.Core.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] - [global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService-2.0.asmx")] public string WebsitePanel_Installer_Core_InstallerService_InstallerService { get { return ((string)(this["WebsitePanel_Installer_Core_InstallerService_InstallerService"])); diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings index 849e4839..32a58250 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings @@ -3,7 +3,7 @@ - http://www.websitepanel.net/Services/InstallerService.asmx + http://www.websitepanel.net/Services/InstallerService-2.0.asmx \ No newline at end of file diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs index bebbfd30..32379607 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs @@ -48,7 +48,7 @@ namespace WebsitePanel.Installer.Core } else { - webService.Url = "http://www.websitepanel.net/Services/InstallerService.asmx"; + webService.Url = "http://www.websitepanel.net/Services/InstallerService-2.0.asmx"; } // check if we need to add a proxy to access Internet diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.disco b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.disco new file mode 100644 index 00000000..a06acfe3 --- /dev/null +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.wsdl similarity index 90% rename from WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl rename to WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.wsdl index 6de2de10..96d74e32 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.wsdl @@ -1,5 +1,5 @@ - + @@ -152,7 +152,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -292,12 +292,12 @@ - - - + + + - - + + \ No newline at end of file diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco deleted file mode 100644 index 25fbb398..00000000 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.cs index 93c71fc7..a551daf5 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.18010 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,26 +9,26 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.1. +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18010. // #pragma warning disable 1591 -namespace WebsitePanel.Installer.Services { +namespace WebsitePanel.Installer.Core.InstallerService { using System; using System.Web.Services; using System.Diagnostics; using System.Web.Services.Protocols; - using System.ComponentModel; using System.Xml.Serialization; + using System.ComponentModel; using System.Data; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Web.Services.WebServiceBindingAttribute(Name="InstallerServiceSoap", Namespace="http://websitepanel.net/services")] - public partial class InstallerService : System.Web.Services.Protocols.SoapHttpClientProtocol { + [System.Web.Services.WebServiceBindingAttribute(Name="InstallerService_20Soap", Namespace="http://websitepanel.net/services")] + public partial class InstallerService_20 : System.Web.Services.Protocols.SoapHttpClientProtocol { private System.Threading.SendOrPostCallback GetReleaseFileInfoOperationCompleted; @@ -45,7 +45,7 @@ namespace WebsitePanel.Installer.Services { private bool useDefaultCredentialsSetExplicitly; /// - public InstallerService() { + public InstallerService_20() { this.Url = global::WebsitePanel.Installer.Core.Properties.Settings.Default.WebsitePanel_Installer_Core_InstallerService_InstallerService; if ((this.IsLocalFileSystemWebService(this.Url) == true)) { this.UseDefaultCredentials = true; @@ -299,11 +299,11 @@ namespace WebsitePanel.Installer.Services { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] public delegate void GetReleaseFileInfoCompletedEventHandler(object sender, GetReleaseFileInfoCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetReleaseFileInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -325,11 +325,11 @@ namespace WebsitePanel.Installer.Services { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] public delegate void GetFileChunkCompletedEventHandler(object sender, GetFileChunkCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetFileChunkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -351,11 +351,11 @@ namespace WebsitePanel.Installer.Services { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] public delegate void GetFileSizeCompletedEventHandler(object sender, GetFileSizeCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetFileSizeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -377,11 +377,11 @@ namespace WebsitePanel.Installer.Services { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] public delegate void GetAvailableComponentsCompletedEventHandler(object sender, GetAvailableComponentsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetAvailableComponentsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -403,11 +403,11 @@ namespace WebsitePanel.Installer.Services { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] public delegate void GetLatestComponentUpdateCompletedEventHandler(object sender, GetLatestComponentUpdateCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetLatestComponentUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -429,11 +429,11 @@ namespace WebsitePanel.Installer.Services { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] public delegate void GetComponentUpdateCompletedEventHandler(object sender, GetComponentUpdateCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetComponentUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map index ebf6cfab..7577a619 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj index c33c09e2..daa4234c 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj @@ -95,12 +95,15 @@ - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs + Designer - + MSDiscoCodeGenerator Reference.cs @@ -110,10 +113,10 @@ - + Dynamic Web References\InstallerService\ - http://www.websitepanel.net/Services/InstallerService.asmx + http://www.websitepanel.net/Services/InstallerService-2.0.asmx @@ -123,7 +126,7 @@ - +