forrk commit

WebsitePanel.Installer/Sources/Setup.WIX/Setup.WIX.wixproj

@@ -6,7 +6,7 @@
     <ProductVersion>3.7</ProductVersion>
     <ProjectGuid>f963a4af-cc72-4512-b636-829345c35318</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>WebsitePanel Installer</OutputName>
+    <OutputName>WebsitePanelInstaller</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

WebsitePanel.Installer/Sources/Setup/WebsitePanel Help.url

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

WebsitePanel.Installer/Sources/Setup/WebsitePanel Web Site.url

@@ -1,9 +0,0 @@
-[DEFAULT]
-BASEURL=http://www.websitepanel.net/
-[InternetShortcut]
-URL=http://www.websitepanel.net/
-IDList=
-IconFile=http://www.websitepanel.net/__utility/img/favicon.ico
-IconIndex=1
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2

WebsitePanel.Installer/Sources/WebsitePanel.Installer.sln

@@ -2,6 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{129305D5-A9E6-4DCE-BFF6-41809E13EEEE}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\WebsitePanel\build.xml = ..\..\WebsitePanel\build.xml
 		..\..\LICENSE.txt = ..\..\LICENSE.txt
 		..\..\Readme.htm = ..\..\Readme.htm
 		..\..\ReleaseNotes.htm = ..\..\ReleaseNotes.htm
@@ -17,8 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Updater", "Web
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Setup", "WebsitePanel.Setup\WebsitePanel.Setup.csproj", "{3951C0EC-BD98-450E-B228-CDBE5BD4AD49}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.SilentInstaller", "WebsitePanel.SilentInstaller\WebsitePanel.SilentInstaller.csproj", "{CD3E79C3-AEEF-43E6-A9ED-1130840FB2CD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Installer.Core", "WebsitePanel.Installer.Core\WebsitePanel.Installer.Core.csproj", "{0E4A3F5B-0BB1-4F63-863D-7B0182B378CF}"
@@ -65,18 +64,6 @@ Global
 		{3951C0EC-BD98-450E-B228-CDBE5BD4AD49}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3951C0EC-BD98-450E-B228-CDBE5BD4AD49}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3951C0EC-BD98-450E-B228-CDBE5BD4AD49}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Debug|Any CPU.ActiveCfg = Debug
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Debug|Any CPU.Build.0 = Debug
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Debug|Mixed Platforms.ActiveCfg = Debug
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Debug|Mixed Platforms.Build.0 = Debug
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Debug|x86.ActiveCfg = Debug
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Debug|x86.Build.0 = Debug
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Release|Any CPU.ActiveCfg = Release
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Release|Any CPU.Build.0 = Release
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Release|Mixed Platforms.ActiveCfg = Release
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Release|Mixed Platforms.Build.0 = Release
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Release|x86.ActiveCfg = Release
-		{2D271041-201E-4E9C-8AB1-B62DC5B0B0E1}.Release|x86.Build.0 = Release
 		{CD3E79C3-AEEF-43E6-A9ED-1130840FB2CD}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{CD3E79C3-AEEF-43E6-A9ED-1130840FB2CD}.Debug|Any CPU.Build.0 = Debug|x86
 		{CD3E79C3-AEEF-43E6-A9ED-1130840FB2CD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86

WebsitePanel.Installer/Sources/WebsitePanel.Installer/App.config

@@ -9,7 +9,7 @@
 		<!-- Studio settings -->
 		<settings>
 			<add key="Log.FileName" value="WebsitePanel.Installer.log" />
-			<add key="Web.Service" value="" />
+			<add key="Web.Service" value="http://www.websitepanel.net/Services/InstallerService-Beta.asmx" />
 			<add key="Web.AutoCheck" value="False" />
 			<add key="Web.Proxy.UseProxy" value="false" />
 			<add key="Web.Proxy.Address" value="" />

WebsitePanel.Installer/Sources/WebsitePanel.Installer/WebsitePanel.Installer.csproj

@@ -57,6 +57,9 @@
   <PropertyGroup>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>websitepanel.Installer.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Ionic.Zip.Reduced, Version=1.8.4.28, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -205,6 +208,9 @@
     <None Include="App.Release.config" />
     <None Include="App.Debug.config" />
     <None Include="Resources\Network16.ico" />
+    <None Include="websitepanel.Installer.manifest">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Network32.ico" />
@@ -250,7 +256,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="application.ico" />
-    <Content Include="Updater.exe" />
+    <EmbeddedResource Include="Updater.exe" />
     <Content Include="websitepanel.ico" />
   </ItemGroup>
   <ItemGroup>

WebsitePanel.Installer/Sources/WebsitePanel.Installer/websitepanel.Installer.manifest

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="WebsitePanel.Installer.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. 
+      Windows will automatically select the most compatible environment.-->
+
+      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->
+
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+
+      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
+
+    </application>
+  </compatibility>
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+
+</asmv1:assembly>

WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/OS.cs

@@ -282,7 +282,11 @@ namespace WebsitePanel.Setup
 			WindowsXP,
 			WindowsServer2003,
 			WindowsVista,
-			WindowsServer2008
+			WindowsServer2008,
+            Windows7,
+            WindowsServer2008R2,
+            Windows8,
+            WindowsServer2012
 		}
 
 		public static string GetName(WindowsVersion version)
@@ -404,10 +408,27 @@ namespace WebsitePanel.Setup
 							}
 							break;
 						case 6:
+                            switch (osInfo.Version.Minor)
+                            {
+                                case 0:
                                     if (info.wProductType == (byte)WinPlatform.VER_NT_WORKSTATION)
                                         ret = WindowsVersion.WindowsVista;
                                     else
                                         ret = WindowsVersion.WindowsServer2008;
+                                    break;
+                                case 1:
+                                    if (info.wProductType == (byte)WinPlatform.VER_NT_WORKSTATION)
+                                        ret = WindowsVersion.Windows7;
+                                    else
+                                        ret = WindowsVersion.WindowsServer2008R2;
+                                    break;
+                                case 2:
+                                    if (info.wProductType == (byte)WinPlatform.VER_NT_WORKSTATION)
+                                        ret = WindowsVersion.Windows8;
+                                    else
+                                        ret = WindowsVersion.WindowsServer2012;
+                                    break;
+                            }
                             break;
 					}
 					break;

WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Utils.cs

@@ -590,16 +590,8 @@ namespace WebsitePanel.Setup
 
 		public static bool CheckAspNet40Registered(SetupVariables setupVariables)
 		{
-			//
+            var regkey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\ASP.NET\\4.0.30319.0");
-			var aspNet40Registered = false;
+            return (regkey != null);
-			// Run ASP.NET Registration Tool command
-			var psOutput = ExecAspNetRegistrationToolCommand(setupVariables, "-lv");
-			// Split process output per lines
-			var strLines = psOutput.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-			// Lookup for an evidence of ASP.NET 4.0
-			aspNet40Registered = strLines.Any((string s) => { return s.Contains("4.0.30319.0"); });
-			//
-			return aspNet40Registered;
 		}
 
 		public static string ExecAspNetRegistrationToolCommand(SetupVariables setupVariables, string arguments)

WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ConfigurationCheckPage.cs

@@ -40,6 +40,7 @@ using WebsitePanel.Setup.Web;
 using System.IO;
 using System.Management;
 using WebsitePanel.Setup.Actions;
+using Microsoft.Win32;
 
 namespace WebsitePanel.Setup
 {
@@ -233,9 +234,14 @@ namespace WebsitePanel.Setup
 				Log.WriteInfo(string.Format("OS check: {0}", details));
 
 				if (!(version == OS.WindowsVersion.WindowsServer2003 ||
-					version == OS.WindowsVersion.WindowsServer2008))
+                    version == OS.WindowsVersion.WindowsServer2008 ||
+                    version == OS.WindowsVersion.WindowsServer2008R2 ||
+                    version == OS.WindowsVersion.WindowsServer2012 ||
+                    version == OS.WindowsVersion.WindowsVista ||
+                    version == OS.WindowsVersion.Windows7 ||
+                    version == OS.WindowsVersion.Windows8 ))
 				{
-					details = "Windows Server 2003 or Windows Server 2008 required.";
+					details = "OS required: Windows Server 2008/2008 R2/2012 or Windows Vista/7/8.";
 					Log.WriteError(string.Format("OS check: {0}", details), null);
 #if DEBUG
 					return CheckStatuses.Warning;
@@ -584,25 +590,22 @@ namespace WebsitePanel.Setup
 
 		private static bool IsWebServerRoleInstalled()
 		{
-			WmiHelper wmi = new WmiHelper("root\\cimv2");
+            RegistryKey regkey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\InetStp");
-			using (ManagementObjectCollection roles = wmi.ExecuteQuery("SELECT NAME FROM Win32_ServerFeature WHERE ID=2"))
+            if (regkey == null)
-			{
+                return false;
-				return (roles.Count > 0);
+
-			}
+            int value = (int)regkey.GetValue("MajorVersion", 0);
+            return value == 7 || value == 8;
 		}
 
 		private static bool IsAspNetRoleServiceInstalled()
 		{
-			WmiHelper wmi = new WmiHelper("root\\cimv2");
+            RegistryKey regkey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\InetStp\\Components");
-			using (ManagementObjectCollection roles = wmi.ExecuteQuery("SELECT NAME FROM Win32_ServerFeature WHERE ID=148"))
+            if (regkey == null)
-			{
+                return false;
-				return (roles.Count > 0);
+
+            int value = (int)regkey.GetValue("ASPNET", 0);
+            return value == 1;
 		}
 	}
-
-
-
-
-
-	}
 }

WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj

@@ -150,9 +150,12 @@
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
-  <Target Name="AfterBuild">
-  </Target>
   -->
+
+  <Target Name="AfterBuild">
+    <Exec Command="$(ProjectDir)..\..\Resources\ILMerge.exe &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Lib\Ionic.Zip.Reduced.dll&quot; /out:$(ProjectDir)..\WebsitePanel.Installer\Updater.exe /ndebug" />
+  </Target>
+  
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.designer.cs

@@ -1,3 +1,31 @@
+// 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>
 //     This code was generated by a tool.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.designer.cs

@@ -1,3 +1,31 @@
+// 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>
 //     This code was generated by a tool.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx.designer.cs

@@ -1,3 +1,31 @@
+// 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>
 //     This code was generated by a tool.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/QuotaViewer.ascx.designer.cs

@@ -1,3 +1,31 @@
+// 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>
 //     This code was generated by a tool.

WebsitePanel/build.xml

@@ -240,6 +240,9 @@
 	
 	<Target Name="CreateSetupBuild" DependsOnTargets="CreateLocalizationToolkitBuild">
 		
+    <!-- Compile updater.exe -->
+    <MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.Updater\WebsitePanel.Updater.csproj" Properties="Configuration=$(BuildConfiguration)" />
+    
 		<!-- build MSI package -->
 		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
 			<Output