From 8f4614b355d2155067a95c51e7942ecca04e62e5 Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE913.europe.corp.microsoft.com>
Date: Sat, 5 Jan 2013 10:42:04 +0400
Subject: [PATCH 01/11] Fixed Exchange Offline Address Book Generation

To recover from previous versions: search on oab.xml within the address list
server, remove all oab.xml files with a size of 1kb and run
Get-OfflineAddressBook | Update-OfflineAddressBook
---
 .../WebsitePanel.Providers.HostedSolution/Exchange2007.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
index f972983b..21a8d875 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
@@ -5072,9 +5072,9 @@ namespace WebsitePanel.Providers.HostedSolution
 
 			string path = AddADPrefix(id);
 
-			Command cmd = new Command("Update-OfflineAddressBook");
-			cmd.Parameters.Add("Identity", id);
-			ExecuteShellCommand(runSpace, cmd);
+			//Command cmd = new Command("Update-OfflineAddressBook");
+			//cmd.Parameters.Add("Identity", id);
+			//ExecuteShellCommand(runSpace, cmd);
 
 			AdjustADSecurity(path, securityGroup, true);
 

From 5595e608325153b2348477853681d7f535786ad1 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 7 Jan 2013 16:24:49 -0500
Subject: [PATCH 02/11] Added tag build-2.0.0.237 for changeset 3705e3ca89dc


From 0c79b2cb032c8d30e9c08c465eee2ceb7e6741cb Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 7 Jan 2013 16:31:52 -0500
Subject: [PATCH 03/11] Added tag build-2.0.0.239 for changeset 3705e3ca89dc


From 0e1a2bd8acba63fd381611c6140703c7fc1a6444 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 11:13:50 -0500
Subject: [PATCH 04/11] 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 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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 @@
   <Profiles />
   <Settings>
     <Setting Name="WebsitePanel_Installer_Core_InstallerService_InstallerService" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService.asmx</Value>
+      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService-2.0.asmx</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerService_20Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerService_20Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+</discovery>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://websitepanel.net/services" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://websitepanel.net/services" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://websitepanel.net/services" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://websitepanel.net/services" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://websitepanel.net/services">
       <s:element name="GetReleaseFileInfo">
@@ -152,7 +152,7 @@
   <wsdl:message name="GetComponentUpdateSoapOut">
     <wsdl:part name="parameters" element="tns:GetComponentUpdateResponse" />
   </wsdl:message>
-  <wsdl:portType name="InstallerServiceSoap">
+  <wsdl:portType name="InstallerService_20Soap">
     <wsdl:operation name="GetReleaseFileInfo">
       <wsdl:input message="tns:GetReleaseFileInfoSoapIn" />
       <wsdl:output message="tns:GetReleaseFileInfoSoapOut" />
@@ -178,7 +178,7 @@
       <wsdl:output message="tns:GetComponentUpdateSoapOut" />
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="InstallerServiceSoap" type="tns:InstallerServiceSoap">
+  <wsdl:binding name="InstallerService_20Soap" type="tns:InstallerService_20Soap">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
     <wsdl:operation name="GetReleaseFileInfo">
       <soap:operation soapAction="http://websitepanel.net/services/GetReleaseFileInfo" style="document" />
@@ -235,7 +235,7 @@
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
-  <wsdl:binding name="InstallerServiceSoap12" type="tns:InstallerServiceSoap">
+  <wsdl:binding name="InstallerService_20Soap12" type="tns:InstallerService_20Soap">
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
     <wsdl:operation name="GetReleaseFileInfo">
       <soap12:operation soapAction="http://websitepanel.net/services/GetReleaseFileInfo" style="document" />
@@ -292,12 +292,12 @@
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
-  <wsdl:service name="InstallerService">
-    <wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
-      <soap:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
+  <wsdl:service name="InstallerService_20">
+    <wsdl:port name="InstallerService_20Soap" binding="tns:InstallerService_20Soap">
+      <soap:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
-    <wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
-      <soap12:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
+    <wsdl:port name="InstallerService_20Soap12" binding="tns:InstallerService_20Soap12">
+      <soap12:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-</discovery>
\ 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 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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;
     
     
     /// <remarks/>
-    [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;
         
         /// <remarks/>
-        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 {
     }
     
     /// <remarks/>
-    [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);
     
     /// <remarks/>
-    [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 {
     }
     
     /// <remarks/>
-    [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);
     
     /// <remarks/>
-    [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 {
     }
     
     /// <remarks/>
-    [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);
     
     /// <remarks/>
-    [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 {
     }
     
     /// <remarks/>
-    [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);
     
     /// <remarks/>
-    [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 {
     }
     
     /// <remarks/>
-    [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);
     
     /// <remarks/>
-    [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 {
     }
     
     /// <remarks/>
-    [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);
     
     /// <remarks/>
-    [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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService-2.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?disco" filename="InstallerService-2.disco" />
   </Results>
 </DiscoveryClientResultsFile>
\ 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 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </None>
-    <None Include="Web References\InstallerService\InstallerService.wsdl" />
+    <None Include="Web References\InstallerService\InstallerService-2.wsdl" />
     <None Include="Web References\InstallerService\Reference.map">
       <Generator>MSDiscoCodeGenerator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
@@ -110,10 +113,10 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService.asmx">
+    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService-2.0.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\InstallerService\</RelPath>
-      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService.asmx</UpdateFromURL>
+      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
@@ -123,7 +126,7 @@
     </WebReferenceUrl>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Web References\InstallerService\InstallerService.disco" />
+    <None Include="Web References\InstallerService\InstallerService-2.disco" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
index 2d080502..7e4789c2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
@@ -13,7 +13,7 @@
         <WebsitePanel.Installer.Core.Properties.Settings>
             <setting name="WebsitePanel_Installer_Core_InstallerService_InstallerService"
                 serializeAs="String">
-                <value>http://www.websitepanel.net/Services/InstallerService.asmx</value>
+                <value>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</value>
             </setting>
         </WebsitePanel.Installer.Core.Properties.Settings>
     </applicationSettings>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
new file mode 100644
index 00000000..69586188
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="InstallerService-2.0.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_20" %>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
new file mode 100644
index 00000000..8fe54629
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
@@ -0,0 +1,53 @@
+/* Copyright (c) 2011, SMB SAAS Systems Inc. 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  SMB SAAS Systems Inc.  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.Linq;
+using System.Web;
+using System.Web.Services;
+using System.Data;
+
+namespace WebsitePanel.WebSite.Services
+{
+    /// <summary>
+    /// Summary description for InstallerService_Beta
+    /// </summary>
+    [WebService(Namespace = "http://websitepanel.net/services")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [System.ComponentModel.ToolboxItem(false)]
+    // To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line. 
+    // [System.Web.Script.Services.ScriptService]
+    public class InstallerService_20 : InstallerServiceBase
+    {
+		public InstallerService_20()
+		{
+			RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.0.xml";
+		}
+    }
+}
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
new file mode 100644
index 00000000..f6ad065a
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="InstallerService-2.1.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_21" %>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs
new file mode 100644
index 00000000..3d4e21f7
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs
@@ -0,0 +1,53 @@
+/* Copyright (c) 2011, SMB SAAS Systems Inc. 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  SMB SAAS Systems Inc.  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.Linq;
+using System.Web;
+using System.Web.Services;
+using System.Data;
+
+namespace WebsitePanel.WebSite.Services
+{
+    /// <summary>
+    /// Summary description for InstallerService_Beta
+    /// </summary>
+    [WebService(Namespace = "http://websitepanel.net/services")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [System.ComponentModel.ToolboxItem(false)]
+    // To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line. 
+    // [System.Web.Script.Services.ScriptService]
+    public class InstallerService_21 : InstallerServiceBase
+    {
+		public InstallerService_21()
+		{
+			RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.1.xml";
+		}
+    }
+}
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
index 66b01697..f55d3643 100644
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
@@ -77,6 +77,8 @@
     <Content Include="Data\ProductReleasesFeed.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Services\InstallerService-2.1.asmx" />
+    <Content Include="Services\InstallerService-2.0.asmx" />
     <Content Include="Services\InstallerService-Staging.asmx" />
     <Content Include="Services\InstallerService-Beta.asmx" />
     <Content Include="Services\InstallerService.asmx" />
@@ -86,6 +88,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\InstallerService-2.1.asmx.cs">
+      <DependentUpon>InstallerService-2.1.asmx</DependentUpon>
+    </Compile>
+    <Compile Include="Services\InstallerService-2.0.asmx.cs">
+      <DependentUpon>InstallerService-2.0.asmx</DependentUpon>
+    </Compile>
     <Compile Include="Services\InstallerService-Staging.asmx.cs">
       <DependentUpon>InstallerService-Staging.asmx</DependentUpon>
     </Compile>

From 59e37b138e5e58ea6cc7cefa51d8744ddb9df0f8 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 11:25:14 -0500
Subject: [PATCH 05/11] Correct Installer Class Name

---
 .../Web References/InstallerService/Reference.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a551daf5..17084c62 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	
@@ -13,7 +13,7 @@
 // 
 #pragma warning disable 1591
 
-namespace WebsitePanel.Installer.Core.InstallerService {
+namespace WebsitePanel.Installer.Services {
     using System;
     using System.Web.Services;
     using System.Diagnostics;

From 8405de0b80a1c18c9c2640e3fb307f1bae85f5c4 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 11:33:39 -0500
Subject: [PATCH 06/11] Backed out changeset: bcf385196371

---
 .../Properties/Settings.Designer.cs           |  6 +--
 .../Properties/Settings.settings              |  2 +-
 .../ServiceProviderProxy.cs                   |  2 +-
 .../InstallerService/InstallerService-2.disco |  6 ---
 .../InstallerService/InstallerService.disco   |  6 +++
 ...erService-2.wsdl => InstallerService.wsdl} | 18 +++----
 .../InstallerService/Reference.cs             | 38 ++++++-------
 .../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, 47 insertions(+), 166 deletions(-)
 delete mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.disco
 create mode 100644 WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco
 rename WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/{InstallerService-2.wsdl => InstallerService.wsdl} (90%)
 delete mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
 delete mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
 delete mode 100644 WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
 delete 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 3f939f6c..26d7262a 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 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18010
+//     Runtime Version:4.0.30319.269
 //
 //     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", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.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-2.0.asmx")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService.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 32a58250..849e4839 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 @@
   <Profiles />
   <Settings>
     <Setting Name="WebsitePanel_Installer_Core_InstallerService_InstallerService" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService-2.0.asmx</Value>
+      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService.asmx</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ 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 32379607..bebbfd30 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-2.0.asmx";
+				webService.Url = "http://www.websitepanel.net/Services/InstallerService.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
deleted file mode 100644
index a06acfe3..00000000
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.disco	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerService_20Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerService_20Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-</discovery>
\ 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
new file mode 100644
index 00000000..25fbb398
--- /dev/null
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+</discovery>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.wsdl b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl
similarity index 90%
rename from WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.wsdl
rename to WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl
index 96d74e32..6de2de10 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService-2.wsdl	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://websitepanel.net/services" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://websitepanel.net/services" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://websitepanel.net/services" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://websitepanel.net/services" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://websitepanel.net/services">
       <s:element name="GetReleaseFileInfo">
@@ -152,7 +152,7 @@
   <wsdl:message name="GetComponentUpdateSoapOut">
     <wsdl:part name="parameters" element="tns:GetComponentUpdateResponse" />
   </wsdl:message>
-  <wsdl:portType name="InstallerService_20Soap">
+  <wsdl:portType name="InstallerServiceSoap">
     <wsdl:operation name="GetReleaseFileInfo">
       <wsdl:input message="tns:GetReleaseFileInfoSoapIn" />
       <wsdl:output message="tns:GetReleaseFileInfoSoapOut" />
@@ -178,7 +178,7 @@
       <wsdl:output message="tns:GetComponentUpdateSoapOut" />
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="InstallerService_20Soap" type="tns:InstallerService_20Soap">
+  <wsdl:binding name="InstallerServiceSoap" type="tns:InstallerServiceSoap">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
     <wsdl:operation name="GetReleaseFileInfo">
       <soap:operation soapAction="http://websitepanel.net/services/GetReleaseFileInfo" style="document" />
@@ -235,7 +235,7 @@
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
-  <wsdl:binding name="InstallerService_20Soap12" type="tns:InstallerService_20Soap">
+  <wsdl:binding name="InstallerServiceSoap12" type="tns:InstallerServiceSoap">
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
     <wsdl:operation name="GetReleaseFileInfo">
       <soap12:operation soapAction="http://websitepanel.net/services/GetReleaseFileInfo" style="document" />
@@ -292,12 +292,12 @@
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
-  <wsdl:service name="InstallerService_20">
-    <wsdl:port name="InstallerService_20Soap" binding="tns:InstallerService_20Soap">
-      <soap:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
+  <wsdl:service name="InstallerService">
+    <wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
+      <soap:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
     </wsdl:port>
-    <wsdl:port name="InstallerService_20Soap12" binding="tns:InstallerService_20Soap12">
-      <soap12:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
+    <wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
+      <soap12:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ 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 17084c62..93c71fc7 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 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18010
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18010.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.1.
 // 
 #pragma warning disable 1591
 
@@ -18,17 +18,17 @@ namespace WebsitePanel.Installer.Services {
     using System.Web.Services;
     using System.Diagnostics;
     using System.Web.Services.Protocols;
-    using System.Xml.Serialization;
     using System.ComponentModel;
+    using System.Xml.Serialization;
     using System.Data;
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name="InstallerService_20Soap", Namespace="http://websitepanel.net/services")]
-    public partial class InstallerService_20 : System.Web.Services.Protocols.SoapHttpClientProtocol {
+    [System.Web.Services.WebServiceBindingAttribute(Name="InstallerServiceSoap", Namespace="http://websitepanel.net/services")]
+    public partial class InstallerService : System.Web.Services.Protocols.SoapHttpClientProtocol {
         
         private System.Threading.SendOrPostCallback GetReleaseFileInfoOperationCompleted;
         
@@ -45,7 +45,7 @@ namespace WebsitePanel.Installer.Services {
         private bool useDefaultCredentialsSetExplicitly;
         
         /// <remarks/>
-        public InstallerService_20() {
+        public InstallerService() {
             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 {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [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.0.30319.17929")]
+    [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 +325,11 @@ namespace WebsitePanel.Installer.Services {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [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.0.30319.17929")]
+    [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 +351,11 @@ namespace WebsitePanel.Installer.Services {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [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.0.30319.17929")]
+    [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 +377,11 @@ namespace WebsitePanel.Installer.Services {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [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.0.30319.17929")]
+    [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 +403,11 @@ namespace WebsitePanel.Installer.Services {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [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.0.30319.17929")]
+    [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 +429,11 @@ namespace WebsitePanel.Installer.Services {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [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.0.30319.17929")]
+    [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 {
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 7577a619..ebf6cfab 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService-2.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?disco" filename="InstallerService-2.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
   </Results>
 </DiscoveryClientResultsFile>
\ 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 daa4234c..c33c09e2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
@@ -95,15 +95,12 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </None>
-    <None Include="Web References\InstallerService\InstallerService-2.wsdl" />
+    <None Include="Web References\InstallerService\InstallerService.wsdl" />
     <None Include="Web References\InstallerService\Reference.map">
       <Generator>MSDiscoCodeGenerator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
@@ -113,10 +110,10 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService-2.0.asmx">
+    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\InstallerService\</RelPath>
-      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</UpdateFromURL>
+      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
@@ -126,7 +123,7 @@
     </WebReferenceUrl>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Web References\InstallerService\InstallerService-2.disco" />
+    <None Include="Web References\InstallerService\InstallerService.disco" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
index 7e4789c2..2d080502 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
@@ -13,7 +13,7 @@
         <WebsitePanel.Installer.Core.Properties.Settings>
             <setting name="WebsitePanel_Installer_Core_InstallerService_InstallerService"
                 serializeAs="String">
-                <value>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</value>
+                <value>http://www.websitepanel.net/Services/InstallerService.asmx</value>
             </setting>
         </WebsitePanel.Installer.Core.Properties.Settings>
     </applicationSettings>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
deleted file mode 100644
index 69586188..00000000
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="InstallerService-2.0.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_20" %>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
deleted file mode 100644
index 8fe54629..00000000
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2011, SMB SAAS Systems Inc. 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  SMB SAAS Systems Inc.  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.Linq;
-using System.Web;
-using System.Web.Services;
-using System.Data;
-
-namespace WebsitePanel.WebSite.Services
-{
-    /// <summary>
-    /// Summary description for InstallerService_Beta
-    /// </summary>
-    [WebService(Namespace = "http://websitepanel.net/services")]
-    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
-    [System.ComponentModel.ToolboxItem(false)]
-    // To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line. 
-    // [System.Web.Script.Services.ScriptService]
-    public class InstallerService_20 : InstallerServiceBase
-    {
-		public InstallerService_20()
-		{
-			RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.0.xml";
-		}
-    }
-}
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
deleted file mode 100644
index f6ad065a..00000000
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="InstallerService-2.1.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_21" %>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs
deleted file mode 100644
index 3d4e21f7..00000000
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2011, SMB SAAS Systems Inc. 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  SMB SAAS Systems Inc.  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.Linq;
-using System.Web;
-using System.Web.Services;
-using System.Data;
-
-namespace WebsitePanel.WebSite.Services
-{
-    /// <summary>
-    /// Summary description for InstallerService_Beta
-    /// </summary>
-    [WebService(Namespace = "http://websitepanel.net/services")]
-    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
-    [System.ComponentModel.ToolboxItem(false)]
-    // To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line. 
-    // [System.Web.Script.Services.ScriptService]
-    public class InstallerService_21 : InstallerServiceBase
-    {
-		public InstallerService_21()
-		{
-			RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.1.xml";
-		}
-    }
-}
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
index f55d3643..66b01697 100644
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
@@ -77,8 +77,6 @@
     <Content Include="Data\ProductReleasesFeed.xml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Services\InstallerService-2.1.asmx" />
-    <Content Include="Services\InstallerService-2.0.asmx" />
     <Content Include="Services\InstallerService-Staging.asmx" />
     <Content Include="Services\InstallerService-Beta.asmx" />
     <Content Include="Services\InstallerService.asmx" />
@@ -88,12 +86,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\InstallerService-2.1.asmx.cs">
-      <DependentUpon>InstallerService-2.1.asmx</DependentUpon>
-    </Compile>
-    <Compile Include="Services\InstallerService-2.0.asmx.cs">
-      <DependentUpon>InstallerService-2.0.asmx</DependentUpon>
-    </Compile>
     <Compile Include="Services\InstallerService-Staging.asmx.cs">
       <DependentUpon>InstallerService-Staging.asmx</DependentUpon>
     </Compile>

From 3474f65f7747c1d249be112e68cb4510409662ef Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 11:42:55 -0500
Subject: [PATCH 07/11] Add Website files back to source after backing out
 prior changeset.

---
 .../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 +++
 5 files changed, 116 insertions(+)
 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.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
new file mode 100644
index 00000000..69586188
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="InstallerService-2.0.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_20" %>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
new file mode 100644
index 00000000..8fe54629
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs
@@ -0,0 +1,53 @@
+/* Copyright (c) 2011, SMB SAAS Systems Inc. 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  SMB SAAS Systems Inc.  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.Linq;
+using System.Web;
+using System.Web.Services;
+using System.Data;
+
+namespace WebsitePanel.WebSite.Services
+{
+    /// <summary>
+    /// Summary description for InstallerService_Beta
+    /// </summary>
+    [WebService(Namespace = "http://websitepanel.net/services")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [System.ComponentModel.ToolboxItem(false)]
+    // To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line. 
+    // [System.Web.Script.Services.ScriptService]
+    public class InstallerService_20 : InstallerServiceBase
+    {
+		public InstallerService_20()
+		{
+			RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.0.xml";
+		}
+    }
+}
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
new file mode 100644
index 00000000..f6ad065a
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="InstallerService-2.1.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_21" %>
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs
new file mode 100644
index 00000000..3d4e21f7
--- /dev/null
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs
@@ -0,0 +1,53 @@
+/* Copyright (c) 2011, SMB SAAS Systems Inc. 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  SMB SAAS Systems Inc.  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.Linq;
+using System.Web;
+using System.Web.Services;
+using System.Data;
+
+namespace WebsitePanel.WebSite.Services
+{
+    /// <summary>
+    /// Summary description for InstallerService_Beta
+    /// </summary>
+    [WebService(Namespace = "http://websitepanel.net/services")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [System.ComponentModel.ToolboxItem(false)]
+    // To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line. 
+    // [System.Web.Script.Services.ScriptService]
+    public class InstallerService_21 : InstallerServiceBase
+    {
+		public InstallerService_21()
+		{
+			RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.1.xml";
+		}
+    }
+}
diff --git a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
index 66b01697..f55d3643 100644
--- a/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
+++ b/WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
@@ -77,6 +77,8 @@
     <Content Include="Data\ProductReleasesFeed.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Services\InstallerService-2.1.asmx" />
+    <Content Include="Services\InstallerService-2.0.asmx" />
     <Content Include="Services\InstallerService-Staging.asmx" />
     <Content Include="Services\InstallerService-Beta.asmx" />
     <Content Include="Services\InstallerService.asmx" />
@@ -86,6 +88,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\InstallerService-2.1.asmx.cs">
+      <DependentUpon>InstallerService-2.1.asmx</DependentUpon>
+    </Compile>
+    <Compile Include="Services\InstallerService-2.0.asmx.cs">
+      <DependentUpon>InstallerService-2.0.asmx</DependentUpon>
+    </Compile>
     <Compile Include="Services\InstallerService-Staging.asmx.cs">
       <DependentUpon>InstallerService-Staging.asmx</DependentUpon>
     </Compile>

From 4f2924aa4b21152818f5d49945fdf59705908252 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 11:43:18 -0500
Subject: [PATCH 08/11] Added tag build-2.0.0.243 for changeset b5c8baca74b8


From 3c8aeefefd92f644b0b56c9f8c8d78e505370c2c Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 12:05:45 -0500
Subject: [PATCH 09/11] Added tag build-2.0.0.244 for changeset 47860dfbc3a0


From 57ebdcd06e8a45a46c25d68c0cb7f3cdc8535e6e Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 12:11:33 -0500
Subject: [PATCH 10/11] Update InstallerService URL

---
 .../Properties/Settings.Designer.cs                         | 2 +-
 .../Properties/Settings.settings                            | 2 +-
 .../WebsitePanel.Installer.Core/ServiceProviderProxy.cs     | 2 +-
 .../Web References/InstallerService/InstallerService.disco  | 6 +++---
 .../Web References/InstallerService/InstallerService.wsdl   | 4 ++--
 .../Web References/InstallerService/Reference.map           | 4 ++--
 .../WebsitePanel.Installer.Core.csproj                      | 4 ++--
 .../Sources/WebsitePanel.Installer.Core/app.config          | 2 +-
 .../Web References/Services/InstallerService.disco          | 6 +++---
 .../Web References/Services/InstallerService.wsdl           | 4 ++--
 .../Web References/Services/Reference.cs                    | 2 +-
 .../Web References/Services/Reference.map                   | 4 ++--
 .../WebsitePanel.Updater/WebsitePanel.Updater.csproj        | 4 ++--
 13 files changed, 23 insertions(+), 23 deletions(-)

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..7ff648a1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs
@@ -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 @@
   <Profiles />
   <Settings>
     <Setting Name="WebsitePanel_Installer_Core_InstallerService_InstallerService" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService.asmx</Value>
+      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService-2.0.asmx</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ 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.disco b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco
index 25fbb398..7d6644d1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>
\ 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.wsdl
index 6de2de10..efe74830 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl	
@@ -294,10 +294,10 @@
   </wsdl:binding>
   <wsdl:service name="InstallerService">
     <wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
-      <soap:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
+      <soap:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
     <wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
-      <soap12:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
+      <soap12:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
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..e67f00f2 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?disco" filename="InstallerService.disco" />
   </Results>
 </DiscoveryClientResultsFile>
\ 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..a6dffff2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
@@ -110,10 +110,10 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService.asmx">
+    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService-2.0.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\InstallerService\</RelPath>
-      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService.asmx</UpdateFromURL>
+      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
index 2d080502..7e4789c2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
@@ -13,7 +13,7 @@
         <WebsitePanel.Installer.Core.Properties.Settings>
             <setting name="WebsitePanel_Installer_Core_InstallerService_InstallerService"
                 serializeAs="String">
-                <value>http://www.websitepanel.net/Services/InstallerService.asmx</value>
+                <value>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</value>
             </setting>
         </WebsitePanel.Installer.Core.Properties.Settings>
     </applicationSettings>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco
index 70beaaa0..a775a480 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?wsdl" docRef="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?wsdl" docRef="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl
index dfe09e67..618a3ec1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl	
@@ -145,10 +145,10 @@
   </wsdl:binding>
   <wsdl:service name="InstallerService">
     <wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
-      <soap:address location="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" />
+      <soap:address location="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
     <wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
-      <soap12:address location="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" />
+      <soap12:address location="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs
index b638760f..5c240ebd 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs	
@@ -40,7 +40,7 @@ namespace WebsitePanel.Updater.Services {
         
         /// <remarks/>
         public InstallerService() {
-            this.Url = "http://localhost/WebsitePanelSite/Services/InstallerService.asmx";
+            this.Url = "http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx";
             if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
                 this.UseDefaultCredentials = true;
                 this.useDefaultCredentialsSetExplicitly = false;
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map
index a404a967..4b67d079 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?disco" filename="InstallerService.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService.wsdl" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
index 68e87839..e23eb9e7 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
@@ -107,10 +107,10 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://localhost/WebsitePanelSite/Services/InstallerService.asmx">
+    <WebReferenceUrl Include="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx">
       <UrlBehavior>Static</UrlBehavior>
       <RelPath>Web References\Services\</RelPath>
-      <UpdateFromURL>http://localhost/WebsitePanelSite/Services/InstallerService.asmx</UpdateFromURL>
+      <UpdateFromURL>http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>

From 0e5d8650604801223908f3cb634a3e1696cd3de6 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 8 Jan 2013 12:26:34 -0500
Subject: [PATCH 11/11] Added tag build-2.0.0.245 for changeset da552d6c7c65