From a105bc90475ea07bfae5afef49cd549b70604ddb Mon Sep 17 00:00:00 2001
From: robvde <devnull@localhost>
Date: Tue, 31 Mar 2015 06:48:07 +0800
Subject: [PATCH] merge commit

---
 .../WebsitePanel.EnterpriseServer.csproj      |  2 ++
 .../WebsitePanel.Server.csproj                | 16 ++++++++++++++++
 .../WebsitePanel.WebPortal.csproj             | 19 +++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
index 0856c2a6..c18d5220 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
@@ -84,6 +84,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="bin\Ionic.Zip.Reduced.dll" />
+    <Content Include="bin\IPAddressRange.dll" />
     <Content Include="bin\Microsoft.Web.Services3.dll" />
     <Content Include="bin\WebsitePanel.Common.Utils.dll" />
     <Content Include="bin\WebsitePanel.Common.Utils.pdb" />
@@ -117,6 +118,7 @@
     <Content Include="bin\WebsitePanel.Templates.pdb" />
     <Content Include="bin\WebsitePanel.Whois.dll" />
     <Content Include="bin\WebsitePanel.Whois.pdb" />
+    <Content Include="bin\WhoisClient.dll" />
     <Content Include="esEnterpriseStorage.asmx" />
     <Content Include="esRemoteDesktopServices.asmx" />
     <Content Include="esHeliconZoo.asmx" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
index 7cfa6f68..8b9f3b8d 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
@@ -124,6 +124,21 @@
     <Content Include="bin\Dns2012\WebsitePanel.Server.Utils.pdb" />
     <Content Include="bin\Exchange2013\WebsitePanel.Providers.HostedSolution.Exchange2013.dll" />
     <Content Include="bin\Exchange2013\WebsitePanel.Providers.HostedSolution.Exchange2013.pdb" />
+    <Content Include="bin\HyperV2012R2\Ionic.Zip.Reduced.dll" />
+    <Content Include="bin\HyperV2012R2\Microsoft.SharePoint.dll" />
+    <Content Include="bin\HyperV2012R2\Microsoft.Storage.Vds.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.HostedSolution.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.HostedSolution.pdb" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Virtualization.HyperV2012R2.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Virtualization.HyperV2012R2.pdb" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Server.Utils.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Server.Utils.pdb" />
+    <Content Include="bin\IceWarp\WebsitePanel.Providers.Mail.IceWarp.dll" />
+    <Content Include="bin\IceWarp\WebsitePanel.Providers.Mail.IceWarp.pdb" />
+    <Content Include="bin\IIs80\WebsitePanel.Providers.Web.IIs80.dll" />
+    <Content Include="bin\IIs80\WebsitePanel.Providers.Web.IIs80.pdb" />
     <Content Include="bin\Ionic.Zip.Reduced.dll" />
     <Content Include="bin\Lync2013\WebsitePanel.Providers.Base.dll" />
     <Content Include="bin\Lync2013\WebsitePanel.Providers.Base.pdb" />
@@ -137,6 +152,7 @@
     <Content Include="bin\Microsoft.Practices.EnterpriseLibrary.Common.dll" />
     <Content Include="bin\Microsoft.Practices.ObjectBuilder.dll" />
     <Content Include="bin\Microsoft.SharePoint.dll" />
+    <Content Include="bin\Microsoft.Storage.Vds.dll" />
     <Content Include="bin\Microsoft.Web.Deployment.dll" />
     <Content Include="bin\Microsoft.Web.Management.dll" />
     <Content Include="bin\Microsoft.Web.PlatformInstaller.dll" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index fb1dac4a..4b3119cd 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -154,19 +154,36 @@
     <Content Include="App_Themes\Default\Icons\webapplicationsgallery_48.png" />
     <Content Include="App_Themes\Default\Icons\webipaddresses_48.png" />
     <Content Include="App_Themes\Default\Icons\websites_48.png" />
+    <Content Include="App_Themes\Default\Images\apply_16.png" />
+    <Content Include="App_Themes\Default\Images\apply_24.png" />
     <Content Include="App_Themes\Default\Images\Exchange\blank16.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\bottom_bg_sh.gif" />
     <Content Include="App_Themes\Default\Images\Exchange\disabled.png" />
     <Content Include="App_Themes\Default\Images\Exchange\disabled_16.png" />
     <Content Include="App_Themes\Default\Images\Exchange\enabled.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\home24.png" />
     <Content Include="App_Themes\Default\Images\Exchange\locked.png" />
     <Content Include="App_Themes\Default\Images\Exchange\lync16.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\main_bg_sh.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\module_footer_sh.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\module_header_sh.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\net_drive16.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\net_drive48.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\shared_16.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\spaces16.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\spaces48.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\vip_user_16.png" />
     <Content Include="App_Themes\Default\Images\FileManager\vbhtml.png" />
+    <Content Include="App_Themes\Default\Images\home_16_blk.png" />
+    <Content Include="App_Themes\Default\Images\home_24.png" />
     <Content Include="App_Themes\Default\Images\lync16.png" />
     <Content Include="App_Themes\Default\Images\lync48.png" />
     <Content Include="App_Themes\Default\Images\lyncfederationdomains48.png" />
     <Content Include="App_Themes\Default\Images\lyncuser.png" />
     <Content Include="App_Themes\Default\Images\lyncuserplan48.png" />
     <Content Include="App_Themes\Default\Images\lyncuserplanadd48.png" />
+    <Content Include="App_Themes\Default\Images\restart_24.png" />
+    <Content Include="App_Themes\Default\Images\signout_24.png" />
     <Content Include="App_Themes\Default\Images\spaces16.png" />
     <Content Include="App_Themes\Default\Images\spaces48.png" />
     <Content Include="App_Themes\Default\Images\VPSForPC\vlan_icon.png" />
@@ -176,7 +193,9 @@
     <Content Include="App_Themes\Default\Images\VPS\event_log_icon.png" />
     <Content Include="App_Themes\Default\Images\VPS\icon-home-botbar-cloud.png" />
     <Content Include="App_Themes\Default\Images\VPS\monitoring_icon.png" />
+    <Content Include="App_Themes\Default\Styles\chosen.min.css" />
     <Content Include="App_Themes\Default\Styles\images\buttons.gif" />
+    <Content Include="App_Themes\Default\Styles\images\chosen-sprite.png" />
     <Content Include="App_Themes\Default\Styles\images\header_bg.gif" />
     <Content Include="App_Themes\Default\Images\shield.png" />
     <Content Include="App_Themes\Default\Styles\images\loading.gif" />