zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various changes to prepare Installers for 1.2.2

Browse source 
Update Installer EULA Date for 2012
Update Build.XML for 1.2.2
Update email address in installer to info@websitepanel.net
This commit is contained in:
omara 2012-05-15 20:01:08 -04:00
parent bb347537af
commit 99e93e99da
20 changed files with 398 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

144
WebsitePanel.Installer/Sources/Setup/Setup.vdproj
View file

@ -45,42 +45,42 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_8358EC0621F48BC59677CAE4E2FA8FC3"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8358EC0621F48BC59677CAE4E2FA8FC3"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_B0491B1356193E1DEAF528DAD55FD861"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_B0491B1356193E1DEAF528DAD55FD861"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_B0491B1356193E1DEAF528DAD55FD861"
"OwnerKey" = "8:_8358EC0621F48BC59677CAE4E2FA8FC3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BD9DC4338DFD4472BE5D099C388608B6" "MsmKey" = "8:_BD9DC4338DFD4472BE5D099C388608B6"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_D1E9D2FA126C6929E2B4AD4D3D6B2B30"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_D1E9D2FA126C6929E2B4AD4D3D6B2B30"
"OwnerKey" = "8:_E0E145E0B464F51A66C25ABBABC52B7D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_D1E9D2FA126C6929E2B4AD4D3D6B2B30"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E0E145E0B464F51A66C25ABBABC52B7D"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E0E145E0B464F51A66C25ABBABC52B7D"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC" "OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -88,21 +88,21 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_D1E9D2FA126C6929E2B4AD4D3D6B2B30"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E0E145E0B464F51A66C25ABBABC52B7D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9" "OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8358EC0621F48BC59677CAE4E2FA8FC3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_B0491B1356193E1DEAF528DAD55FD861"
"MsmSig" = "8:_UNDEFINED"
}
} }
"Configurations" "Configurations"
{ {
@ -153,7 +153,7 @@
"DisplayName" = "8:Release" "DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE" "IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE" "IsReleaseOnly" = "11:TRUE"
"OutputFilename" = "8:..\\..\\..\\WebsitePanel\\Deploy\\Release\\WebsitePanelInstaller121.msi" "OutputFilename" = "8:..\\..\\..\\WebsitePanel\\Deploy\\Release\\WebsitePanelInstaller122.msi"
"PackageFilesAs" = "3:2" "PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648" "PackageFileSize" = "3:-2147483648"
"CabType" = "3:1" "CabType" = "3:1"
@ -177,6 +177,11 @@
"Name" = "8:Microsoft .NET Framework 4 (x86 and x64)" "Name" = "8:Microsoft .NET Framework 4 (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.0" "ProductCode" = "8:.NETFramework,Version=v4.0"
} }
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5"
{
"Name" = "8:Windows Installer 4.5"
"ProductCode" = "8:Microsoft.Windows.Installer.4.5"
}
} }
} }
} }
@ -268,16 +273,10 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8358EC0621F48BC59677CAE4E2FA8FC3" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BD9DC4338DFD4472BE5D099C388608B6"
{ {
"AssemblyRegister" = "3:1" "SourcePath" = "8:Banner.bmp"
"AssemblyIsInGAC" = "11:FALSE" "TargetName" = "8:Banner.bmp"
"AssemblyAsmDisplayName" = "8:WebsitePanel.Installer.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
"SourcePath" = "8:WebsitePanel.Installer.Core.dll"
"TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB" "Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"
"Condition" = "8:" "Condition" = "8:"
@ -290,22 +289,17 @@
"SharedLegacy" = "11:FALSE" "SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1" "PackageAs" = "3:1"
"Register" = "3:1" "Register" = "3:1"
"Exclude" = "11:FALSE" "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0491B1356193E1DEAF528DAD55FD861" "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D1E9D2FA126C6929E2B4AD4D3D6B2B30"
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Ionic.Zip.Reduced, Version=1.8.4.28, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Ionic.Zip.Reduced, Version=1.8.4.28, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_B0491B1356193E1DEAF528DAD55FD861"
{
"Name" = "8:Ionic.Zip.Reduced.dll"
"Attributes" = "3:512"
}
} }
"SourcePath" = "8:Ionic.Zip.Reduced.dll" "SourcePath" = "8:Ionic.Zip.Reduced.dll"
"TargetName" = "8:" "TargetName" = "8:"
@ -325,10 +319,16 @@
"IsDependency" = "11:TRUE" "IsDependency" = "11:TRUE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BD9DC4338DFD4472BE5D099C388608B6" "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0E145E0B464F51A66C25ABBABC52B7D"
{ {
"SourcePath" = "8:Banner.bmp" "AssemblyRegister" = "3:1"
"TargetName" = "8:Banner.bmp" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:WebsitePanel.Installer.Core, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
"SourcePath" = "8:WebsitePanel.Installer.Core.dll"
"TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB" "Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"
"Condition" = "8:" "Condition" = "8:"
@ -341,8 +341,8 @@
"SharedLegacy" = "11:FALSE" "SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1" "PackageAs" = "3:1"
"Register" = "3:1" "Register" = "3:1"
"Exclude" = "11:TRUE" "Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE" "IsDependency" = "11:TRUE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
} }
@ -412,19 +412,19 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WebsitePanel Installer" "ProductName" = "8:WebsitePanel Installer"
"ProductCode" = "8:{A22F374C-4AFC-4B5D-A509-7456A6107588}" "ProductCode" = "8:{A09C3303-E60E-4A3E-B0F9-96CEE379FFF7}"
"PackageCode" = "8:{62AE518E-85D1-4D7E-9642-660FB1794974}" "PackageCode" = "8:{C49F3454-E18F-4146-A97C-7951FBB6C9B3}"
"UpgradeCode" = "8:{2950A907-11E7-436C-86CE-049C414AFD08}" "UpgradeCode" = "8:{2950A907-11E7-436C-86CE-049C414AFD08}"
"AspNetVersion" = "8:4.0.30319.0" "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE" "DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:TRUE" "InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.2.1" "ProductVersion" = "8:1.2.2"
"Manufacturer" = "8:Outercurve Foundation" "Manufacturer" = "8:Outercurve Foundation"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"
"Title" = "8:WebsitePanel Installer" "Title" = "8:WebsitePanel Installer (Beta)"
"Subject" = "8:" "Subject" = "8:"
"ARPCONTACT" = "8:Outercurve Foundation" "ARPCONTACT" = "8:Outercurve Foundation"
"Keywords" = "8:" "Keywords" = "8:"
@ -972,7 +972,7 @@
{ {
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_05F59A142DD147798C90054A203C0EE9" "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_05F59A142DD147798C90054A203C0EE9"
{ {
"SourcePath" = "8:..\\WebsitePanel.Installer\\obj\\Debug\\WebsitePanel.Installer.exe" "SourcePath" = "8:..\\WebsitePanel.Installer\\obj\\Release\\WebsitePanel.Installer.exe"
"TargetName" = "8:" "TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB" "Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"
@ -1000,7 +1000,7 @@
} }
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1239E87E938248B1BAF9BF75C32D3EDC" "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1239E87E938248B1BAF9BF75C32D3EDC"
{ {
"SourcePath" = "8:..\\WebsitePanel.SilentInstaller\\obj\\x86\\Debug\\WebsitePanel.SilentInstaller.exe" "SourcePath" = "8:..\\WebsitePanel.SilentInstaller\\obj\\x86\\Release\\WebsitePanel.SilentInstaller.exe"
"TargetName" = "8:" "TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB" "Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"

4
WebsitePanel.Installer/Sources/Setup/WebsitePanel Help.url
View file

@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
BASEURL=http://help.websitepanel.net/ BASEURL=http://www.websitepanel.net/
[InternetShortcut] [InternetShortcut]
URL=http://help.websitepanel.net/ URL=http://www.websitepanel.net/
IDList= IDList=
[{000214A0-0000-0000-C000-000000000046}] [{000214A0-0000-0000-C000-000000000046}]
Prop3=19,2 Prop3=19,2

6
WebsitePanel.Installer/Sources/VersionInfo.cs
View file

@ -36,6 +36,6 @@ using System.Reflection;
// //
[assembly: AssemblyCompany("Outercurve Foundation")] [assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")] [assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.1.0")] [assembly: AssemblyVersion("1.2.2.0")]
[assembly: AssemblyFileVersion("1.2.1.0")] [assembly: AssemblyFileVersion("1.2.2.1")]
[assembly: AssemblyInformationalVersion("1.2.1")] [assembly: AssemblyInformationalVersion("1.2.2")]

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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.269
// //
// 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.

28
WebsitePanel.Installer/Sources/WebsitePanel.Installer/ApplicationForm.Designer.cs generated
View file

@ -38,13 +38,14 @@ namespace WebsitePanel.Installer
this.pnlRight = new System.Windows.Forms.Panel(); this.pnlRight = new System.Windows.Forms.Panel();
this.pnlResultView = new System.Windows.Forms.Panel(); this.pnlResultView = new System.Windows.Forms.Panel();
this.pnlDescription = new System.Windows.Forms.Panel(); this.pnlDescription = new System.Windows.Forms.Panel();
this.lineBox2 = new WebsitePanel.Installer.LineBox();
this.lblResultViewPath = new System.Windows.Forms.Label(); this.lblResultViewPath = new System.Windows.Forms.Label();
this.lblResultViewTitle = new System.Windows.Forms.Label(); this.lblResultViewTitle = new System.Windows.Forms.Label();
this.pictureBox = new System.Windows.Forms.PictureBox(); this.pictureBox = new System.Windows.Forms.PictureBox();
this.backgroundWorker = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker = new System.ComponentModel.BackgroundWorker();
this.lineBox2 = new WebsitePanel.Installer.LineBox();
this.topLogoControl = new WebsitePanel.Installer.TopLogoControl(); this.topLogoControl = new WebsitePanel.Installer.TopLogoControl();
this.statusBar.SuspendLayout(); this.statusBar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel1.SuspendLayout();
this.splitContainer.Panel2.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout();
this.splitContainer.SuspendLayout(); this.splitContainer.SuspendLayout();
@ -145,6 +146,17 @@ namespace WebsitePanel.Installer
this.pnlDescription.Size = new System.Drawing.Size(376, 63); this.pnlDescription.Size = new System.Drawing.Size(376, 63);
this.pnlDescription.TabIndex = 13; this.pnlDescription.TabIndex = 13;
// //
// lineBox2
//
this.lineBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lineBox2.Location = new System.Drawing.Point(6, 51);
this.lineBox2.Name = "lineBox2";
this.lineBox2.Size = new System.Drawing.Size(366, 2);
this.lineBox2.TabIndex = 16;
this.lineBox2.TabStop = false;
this.lineBox2.Text = "lineBox2";
//
// lblResultViewPath // lblResultViewPath
// //
this.lblResultViewPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblResultViewPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -176,17 +188,6 @@ namespace WebsitePanel.Installer
this.pictureBox.TabIndex = 13; this.pictureBox.TabIndex = 13;
this.pictureBox.TabStop = false; this.pictureBox.TabStop = false;
// //
// lineBox2
//
this.lineBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lineBox2.Location = new System.Drawing.Point(6, 51);
this.lineBox2.Name = "lineBox2";
this.lineBox2.Size = new System.Drawing.Size(366, 2);
this.lineBox2.TabIndex = 16;
this.lineBox2.TabStop = false;
this.lineBox2.Text = "lineBox2";
//
// topLogoControl // topLogoControl
// //
this.topLogoControl.BackColor = System.Drawing.Color.White; this.topLogoControl.BackColor = System.Drawing.Color.White;
@ -208,12 +209,13 @@ namespace WebsitePanel.Installer
this.MinimumSize = new System.Drawing.Size(640, 480); this.MinimumSize = new System.Drawing.Size(640, 480);
this.Name = "ApplicationForm"; this.Name = "ApplicationForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "WebsitePanel Installer"; this.Text = "WebsitePanel Installer (Beta)";
this.Shown += new System.EventHandler(this.OnApplicationFormShown); this.Shown += new System.EventHandler(this.OnApplicationFormShown);
this.statusBar.ResumeLayout(false); this.statusBar.ResumeLayout(false);
this.statusBar.PerformLayout(); this.statusBar.PerformLayout();
this.splitContainer.Panel1.ResumeLayout(false); this.splitContainer.Panel1.ResumeLayout(false);
this.splitContainer.Panel2.ResumeLayout(false); this.splitContainer.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
this.splitContainer.ResumeLayout(false); this.splitContainer.ResumeLayout(false);
this.pnlRight.ResumeLayout(false); this.pnlRight.ResumeLayout(false);
this.pnlDescription.ResumeLayout(false); this.pnlDescription.ResumeLayout(false);

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer/ApplicationForm.cs
View file

@ -339,7 +339,7 @@ namespace WebsitePanel.Installer
internal void ShowError() internal void ShowError()
{ {
ShowError("An unexpected error has occurred. We apologize for this inconvenience.\n" + ShowError("An unexpected error has occurred. We apologize for this inconvenience.\n" +
"Please contact Technical Support at support@websitepanel.net.\n\n" + "Please contact Technical Support at info@websitepanel.net.\n\n" +
"Make sure you include a copy of the Installer.log file from the\n" + "Make sure you include a copy of the Installer.log file from the\n" +
"WebsitePanel Installer home directory."); "WebsitePanel Installer home directory.");
} }

12
WebsitePanel.Installer/Sources/WebsitePanel.Installer/ApplicationForm.resx
View file

@ -112,21 +112,21 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="statusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="statusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="smallImages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="smallImages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>115, 17</value> <value>115, 17</value>
</metadata> </metadata>
<metadata name="backgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="backgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>229, 17</value> <value>229, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAoAAAAAAAEACADKTwAApgAAADAwAAABAAgAqA4AAHBQAAAgIAAAAQAIAKgIAAAYXwAAGBgAAAEA AAABAAoAAAAAAAEACADKTwAApgAAADAwAAABAAgAqA4AAHBQAAAgIAAAAQAIAKgIAAAYXwAAGBgAAAEA

4
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Program.cs
View file

@ -148,7 +148,7 @@ namespace WebsitePanel.Installer
{ {
Log.WriteError("Fatal error occured.", e.Exception); Log.WriteError("Fatal error occured.", e.Exception);
string message = "A fatal error has occurred. We apologize for this inconvenience.\n" + string message = "A fatal error has occurred. We apologize for this inconvenience.\n" +
"Please contact Technical Support at support@websitepanel.net.\n\n" + "Please contact Technical Support at info@websitepanel.net.\n\n" +
"Make sure you include a copy of the Installer.log file from the\n" + "Make sure you include a copy of the Installer.log file from the\n" +
"WebsitePanel Installer home directory."; "WebsitePanel Installer home directory.";
MessageBox.Show(message, "WebsitePanel Installer", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show(message, "WebsitePanel Installer", MessageBoxButtons.OK, MessageBoxIcon.Error);
@ -162,7 +162,7 @@ namespace WebsitePanel.Installer
{ {
Log.WriteError("Fatal error occured.", (Exception)e.ExceptionObject); Log.WriteError("Fatal error occured.", (Exception)e.ExceptionObject);
string message = "A fatal error has occurred. We apologize for this inconvenience.\n" + string message = "A fatal error has occurred. We apologize for this inconvenience.\n" +
"Please contact Technical Support at support@websitepanel.net.\n\n" + "Please contact Technical Support at info@websitepanel.net.\n\n" +
"Make sure you include a copy of the Installer.log file from the\n" + "Make sure you include a copy of the Installer.log file from the\n" +
"WebsitePanel Installer home directory."; "WebsitePanel Installer home directory.";
MessageBox.Show(message, "WebsitePanel Installer", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show(message, "WebsitePanel Installer", MessageBoxButtons.OK, MessageBoxIcon.Error);

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
View file

Binary file not shown.

2
WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/BaseActionManager.cs
View file

@ -296,7 +296,7 @@ namespace WebsitePanel.Setup.Actions
var args = new ActionErrorEventArgs var args = new ActionErrorEventArgs
{ {
ErrorMessage = "An unexpected error has occurred. We apologize for this inconvenience.\n" + ErrorMessage = "An unexpected error has occurred. We apologize for this inconvenience.\n" +
"Please contact Technical Support at support@websitepanel.net.\n\n" + "Please contact Technical Support at info@websitepanel.net.\n\n" +
"Make sure you include a copy of the Installer.log file from the\n" + "Make sure you include a copy of the Installer.log file from the\n" +
"WebsitePanel Installer home directory.", "WebsitePanel Installer home directory.",
OriginalException = ex, OriginalException = ex,

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Setup/EULA.rtf
View file

Binary file not shown.

27
WebsitePanel.Installer/Sources/WebsitePanel.Setup/EnterpriseServer10.cs
View file

@ -5,7 +5,34 @@ using System.Windows.Forms;
using WebsitePanel.Setup.Actions; using WebsitePanel.Setup.Actions;
namespace WebsitePanel.Setup namespace WebsitePanel.Setup
{ {
/// <summary>
/// Release 1.2.2
/// </summary>
public class EnterpriseServer122 : EnterpriseServer
{
public static new object Install(object obj)
{
//
return EnterpriseServer.InstallBase(obj, "1.2.2");
}
public static new DialogResult Uninstall(object obj)
{
return EnterpriseServer.Uninstall(obj);
}
public static new DialogResult Setup(object obj)
{
return EnterpriseServer.Setup(obj);
}
public static new DialogResult Update(object obj)
{
return UpdateBase(obj, "1.2.2", "1.2.1", true);
}
}
/// <summary> /// <summary>
/// Release 1.2.1 /// Release 1.2.1
/// </summary> /// </summary>

27
WebsitePanel.Installer/Sources/WebsitePanel.Setup/Portal10.cs
View file

@ -6,6 +6,33 @@ using WebsitePanel.Setup.Actions;
namespace WebsitePanel.Setup namespace WebsitePanel.Setup
{ {
/// <summary>
/// Release 1.2.2
/// </summary>
public class Portal122 : Portal
{
public static new object Install(object obj)
{
//
return Portal.InstallBase(obj, "1.2.2");
}
public static new DialogResult Uninstall(object obj)
{
return Portal.Uninstall(obj);
}
public static new DialogResult Setup(object obj)
{
return Portal.Setup(obj);
}
public static new DialogResult Update(object obj)
{
return UpdateBase(obj, "1.2.2", "1.2.1", false);
}
}
/// <summary> /// <summary>
/// Release 1.2.1 /// Release 1.2.1
/// </summary> /// </summary>

27
WebsitePanel.Installer/Sources/WebsitePanel.Setup/Server10.cs
View file

@ -6,6 +6,33 @@ using WebsitePanel.Setup.Actions;
namespace WebsitePanel.Setup namespace WebsitePanel.Setup
{ {
/// <summary>
/// Release 1.2.2
/// </summary>
public class Server122 : Server
{
public static new object Install(object obj)
{
//
return Server.InstallBase(obj, "1.2.2");
}
public static new object Uninstall(object obj)
{
return Server.Uninstall(obj);
}
public static new object Setup(object obj)
{
return Server.Setup(obj);
}
public static new object Update(object obj)
{
return Server.UpdateBase(obj, "1.2.2", "1.2.1", false);
}
}
/// <summary> /// <summary>
/// Release 1.2.1 /// Release 1.2.1
/// </summary> /// </summary>

12
WebsitePanel.Installer/Sources/WebsitePanel.Setup/StandaloneServerSetup10.cs
View file

@ -5,6 +5,18 @@ using System.Windows.Forms;
namespace WebsitePanel.Setup namespace WebsitePanel.Setup
{ {
/// <summary>
/// Release 1.2.2
/// </summary>
public class StandaloneServerSetup122 : StandaloneServerSetup
{
public static new object Install(object obj)
{
return StandaloneServerSetup.InstallBase(obj, "1.2.2");
}
}
/// <summary> /// <summary>
/// Release 1.2.1 /// Release 1.2.1
/// </summary> /// </summary>

2
WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/WizardPageBase.cs
View file

@ -293,7 +293,7 @@ namespace WebsitePanel.Setup
protected void ShowError() protected void ShowError()
{ {
ShowError("An unexpected error has occurred. We apologize for this inconvenience.\n" + ShowError("An unexpected error has occurred. We apologize for this inconvenience.\n" +
"Please contact Technical Support at support@websitepanel.net.\n\n" + "Please contact Technical Support at info@websitepanel.net.\n\n" +
"Make sure you include a copy of the Installer.log file from the\n" + "Make sure you include a copy of the Installer.log file from the\n" +
"WebsitePanel Installer home directory."); "WebsitePanel Installer home directory.");
} }

2
WebsitePanel.Installer/Sources/WebsitePanel.Updater/UpdaterForm.cs
View file

@ -272,7 +272,7 @@ namespace WebsitePanel.Updater
private void ShowError() private void ShowError()
{ {
string message = "An unexpected error has occurred. We apologize for this inconvenience.\n" + string message = "An unexpected error has occurred. We apologize for this inconvenience.\n" +
"Please contact Technical Support at support@websitepanel.net"; "Please contact Technical Support at info@websitepanel.net";
MessageBox.Show(this, message, this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show(this, message, this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
} }

13
WebsitePanel/Sources/VersionInfo.cs
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.261 // Runtime Version:4.0.30319.269
// //
// 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.
@ -10,13 +10,14 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Outercurve Foundation")] [assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2011 Outercurve Foundation.")] [assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.1.0")] [assembly: AssemblyVersion("1.2.2.0")]
[assembly: AssemblyFileVersion("1.2.1.6")] [assembly: AssemblyFileVersion("1.2.2.1")]
[assembly: AssemblyInformationalVersion("1.2.1")] [assembly: AssemblyInformationalVersion("1.2.2")]

13
WebsitePanel/Sources/VersionInfo.vb
View file

@ -1,7 +1,7 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' This code was generated by a tool. ' This code was generated by a tool.
' Runtime Version:4.0.30319.261 ' Runtime Version:4.0.30319.269
' '
' 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.
@ -13,11 +13,12 @@ Option Explicit On
Imports System Imports System
Imports System.Reflection Imports System.Reflection
Imports System.Resources
Imports System.Runtime.CompilerServices Imports System.Runtime.CompilerServices
Imports System.Runtime.InteropServices Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Outercurve Foundation"), _ <Assembly: AssemblyCompany("Outercurve Foundation"), _
Assembly: AssemblyCopyright("Copyright © 2011 Outercurve Foundation."), _ Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
Assembly: AssemblyVersion("1.2.1.0"), _ Assembly: AssemblyVersion("1.2.2.0"), _
Assembly: AssemblyFileVersion("1.2.1.6"), _ Assembly: AssemblyFileVersion("1.2.2.1"), _
Assembly: AssemblyInformationalVersion("1.2.1")> Assembly: AssemblyInformationalVersion("1.2.2")>

16
WebsitePanel/build.xml
View file

@ -1,10 +1,10 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="C:\Program Files (x86)\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/> <Import Project="C:\Program Files\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
<PropertyGroup> <PropertyGroup>
<Version>1.2.1.0</Version> <Version>1.2.2.0</Version>
<FileVersion>1.2.1.6</FileVersion> <FileVersion>1.2.2.1</FileVersion>
<VersionLabel>1.2.1</VersionLabel> <VersionLabel>1.2.2</VersionLabel>
<ReleaseDate>2012-03-29</ReleaseDate> <ReleaseDate>2012-05-13</ReleaseDate>
<BuildConfiguration>Release</BuildConfiguration> <BuildConfiguration>Release</BuildConfiguration>
<RootFolder>..</RootFolder> <RootFolder>..</RootFolder>
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder> <TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
@ -15,7 +15,7 @@
<BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder> <BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder>
<DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder> <DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder>
<PreviousBuildFolder>C:\Projects\WebsitePanel-1.2.0-distr\$(BuildConfiguration)</PreviousBuildFolder> <PreviousBuildFolder>C:\Projects\WebsitePanel-1.2.1\$(BuildConfiguration)</PreviousBuildFolder>
<DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd> <DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd>
<SqlCmd>"C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd> <SqlCmd>"C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
@ -42,9 +42,9 @@
</PropertyGroup> </PropertyGroup>
<Target Name="GenerateBuildVersionFiles"> <Target Name="GenerateBuildVersionFiles">
<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2011 Outercurve Foundation." <AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" /> AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
<AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2011 Outercurve Foundation." <AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" /> AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
</Target> </Target>