Commit after merge
This commit is contained in:
commit
7f967a6b8e
7 changed files with 334 additions and 1451 deletions
BIN
WebsitePanel.Installer/Sources/Setup.WIX/WebSitePanel.ico
Normal file
BIN
WebsitePanel.Installer/Sources/Setup.WIX/WebSitePanel.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
File diff suppressed because it is too large
Load diff
|
@ -1,7 +1,35 @@
|
||||||
//------------------------------------------------------------------------------
|
// Copyright (c) 2012, Outercurve Foundation.
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
// are permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// - Redistributions of source code must retain the above copyright notice, this
|
||||||
|
// list of conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// - Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
// this list of conditions and the following disclaimer in the documentation
|
||||||
|
// and/or other materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// - Neither the name of the Outercurve Foundation nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived from this
|
||||||
|
// software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
// Runtime Version:4.0.30319.1
|
// Runtime Version:4.0.30319.17929
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
|
@ -60,6 +88,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Computer16 {
|
internal static System.Drawing.Icon Computer16 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Computer16", resourceCulture);
|
object obj = ResourceManager.GetObject("Computer16", resourceCulture);
|
||||||
|
@ -67,6 +98,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Computer32 {
|
internal static System.Drawing.Icon Computer32 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Computer32", resourceCulture);
|
object obj = ResourceManager.GetObject("Computer32", resourceCulture);
|
||||||
|
@ -74,6 +108,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Folder16 {
|
internal static System.Drawing.Icon Folder16 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Folder16", resourceCulture);
|
object obj = ResourceManager.GetObject("Folder16", resourceCulture);
|
||||||
|
@ -81,6 +118,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Folder32 {
|
internal static System.Drawing.Icon Folder32 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Folder32", resourceCulture);
|
object obj = ResourceManager.GetObject("Folder32", resourceCulture);
|
||||||
|
@ -88,6 +128,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Network16 {
|
internal static System.Drawing.Icon Network16 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Network16", resourceCulture);
|
object obj = ResourceManager.GetObject("Network16", resourceCulture);
|
||||||
|
@ -95,6 +138,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Network32 {
|
internal static System.Drawing.Icon Network32 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Network32", resourceCulture);
|
object obj = ResourceManager.GetObject("Network32", resourceCulture);
|
||||||
|
@ -102,6 +148,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Service16 {
|
internal static System.Drawing.Icon Service16 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Service16", resourceCulture);
|
object obj = ResourceManager.GetObject("Service16", resourceCulture);
|
||||||
|
@ -109,6 +158,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Service32 {
|
internal static System.Drawing.Icon Service32 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Service32", resourceCulture);
|
object obj = ResourceManager.GetObject("Service32", resourceCulture);
|
||||||
|
@ -116,6 +168,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Tool16 {
|
internal static System.Drawing.Icon Tool16 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Tool16", resourceCulture);
|
object obj = ResourceManager.GetObject("Tool16", resourceCulture);
|
||||||
|
@ -123,6 +178,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon Tool32 {
|
internal static System.Drawing.Icon Tool32 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("Tool32", resourceCulture);
|
object obj = ResourceManager.GetObject("Tool32", resourceCulture);
|
||||||
|
@ -130,6 +188,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon World16 {
|
internal static System.Drawing.Icon World16 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("World16", resourceCulture);
|
object obj = ResourceManager.GetObject("World16", resourceCulture);
|
||||||
|
@ -137,6 +198,9 @@ namespace WebsitePanel.Installer.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
|
||||||
|
/// </summary>
|
||||||
internal static System.Drawing.Icon World32 {
|
internal static System.Drawing.Icon World32 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("World32", resourceCulture);
|
object obj = ResourceManager.GetObject("World32", resourceCulture);
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 15 KiB |
|
@ -154,8 +154,8 @@ namespace WebsitePanel.Providers.FTP
|
||||||
|
|
||||||
Log.WriteInfo("Find users nodes");
|
Log.WriteInfo("Find users nodes");
|
||||||
// find users node
|
// find users node
|
||||||
XmlNode fzServerNode = doc.SelectSingleNode("/FileZillaServer");
|
XmlNode fzServerNode = doc.SelectSingleNode("FileZillaServer");
|
||||||
XmlNode fzAccountsNode = fzServerNode.SelectSingleNode("/Users");
|
XmlNode fzAccountsNode = fzServerNode.SelectSingleNode("Users");
|
||||||
if (fzAccountsNode == null)
|
if (fzAccountsNode == null)
|
||||||
{
|
{
|
||||||
fzAccountsNode = doc.CreateElement("Users");
|
fzAccountsNode = doc.CreateElement("Users");
|
||||||
|
|
|
@ -533,18 +533,19 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="uploadtoftp">
|
<Target Name="uploadtoftp">
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" RemoteFiles="WebsitePanel-Portal-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" RemoteFiles="WebsitePanel-Portal-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" RemoteFiles="WebsitePanel-EnterpriseServer-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" RemoteFiles="WebsitePanel-EnterpriseServer-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version).zip" RemoteFiles="WebsitePanel-Server-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version).zip" RemoteFiles="WebsitePanel-Server-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" RemoteFiles="WebsitePanel-StandaloneServerSetup-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" RemoteFiles="WebsitePanel-StandaloneServerSetup-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Portal-$(Version)-Update.zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Portal-$(Version)-Update.zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" RemoteFiles="WebsitePanel-EnterpriseServer-$(Version)-Update.zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" RemoteFiles="WebsitePanel-EnterpriseServer-$(Version)-Update.zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Server-$(Version)-Update.zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Server-$(Version)-Update.zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" RemoteFiles="WebsitePanel-Import-CsvBulk-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" RemoteFiles="WebsitePanel-Import-CsvBulk-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" RemoteFiles="WebsitePanel-Import-Enterprise-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" RemoteFiles="WebsitePanel-Import-Enterprise-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" RemoteFiles="WebsitePanel-AWStatsViewer-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" RemoteFiles="WebsitePanel-AWStatsViewer-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit.msi" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit-$(Version).msi" />
|
||||||
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanelInstaller.msi" RemoteFiles="WebsitePanelInstaller-$(Version).msi" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="uploadtocodeplex">
|
<Target Name="uploadtocodeplex">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue