Backed out changeset: bcf385196371

This commit is contained in:
Virtuworks 2013-01-08 11:33:39 -05:00
parent 59e37b138e
commit 8405de0b80
15 changed files with 47 additions and 166 deletions

View file

@ -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"]));

View file

@ -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>

View file

@ -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

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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 {

View file

@ -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>

View file

@ -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.

View file

@ -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>