merge commit

This commit is contained in:
robvde 2015-03-31 06:48:07 +08:00
parent f968209010
commit a105bc9047
3 changed files with 37 additions and 0 deletions

View file

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