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

Merge with Omar

Browse source
This commit is contained in:
feodor_fitsner 2012-03-05 15:17:46 -08:00
commit 094c838d85
235 changed files with 6289 additions and 2962 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.Server/VirtualizationServerForPrivateCloud.asmx.cs
View file

@ -154,7 +154,7 @@ namespace WebsitePanel.Server
Log.WriteEnd("'{0}' CreateVMFromVM", ProviderSettings.ProviderName);
return result;
}
catch (System.TimeoutException ex)
catch (System.TimeoutException)
{
return result;
}

4
WebsitePanel/Sources/WebsitePanel.Server/Web.config
View file

@ -44,7 +44,7 @@
<!-- Perform security check -->
<enabled value="true"/>
<!-- Server password -->
<password value="${installer.server.password}"/>
<password value="Z6JYIY9o9rX3FCWTz0sffYdiLdg="/>
</security>
</websitepanel.server>
<system.web>
@ -63,7 +63,7 @@
</protocols>
<soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3"/>
</webServices>
<compilation debug="true" targetFramework="4.0"/>
<compilation debug="true" />
</system.web>
<!-- WSE 3.0 settings -->
<microsoft.web.services3>

11
WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
View file

@ -16,7 +16,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
</PropertyGroup>
@ -54,7 +54,6 @@
<Reference Include="System.Management" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
@ -203,14 +202,6 @@
<Project>{684C932A-6C75-46AC-A327-F3689D89EB42}</Project>
<Name>WebsitePanel.Providers.Base</Name>
</ProjectReference>
<ProjectReference Include="..\WebsitePanel.Providers.Virtualization.HyperVForPC\WebsitePanel.Providers.VirtualizationForPC.HyperVForPC.csproj">
<Project>{64BEEB10-7F9F-4860-B2FF-84CDA02766B3}</Project>
<Name>WebsitePanel.Providers.VirtualizationForPC.HyperVForPC</Name>
</ProjectReference>
<ProjectReference Include="..\WebsitePanel.Providers.Web.IIs60\WebsitePanel.Providers.Web.IIs60.csproj">
<Project>{9BE0317D-E42E-4FF6-9A87-8C801F046EA1}</Project>
<Name>WebsitePanel.Providers.Web.IIs60</Name>
</ProjectReference>
<ProjectReference Include="..\WebsitePanel.Server.Utils\WebsitePanel.Server.Utils.csproj">
<Project>{E91E52F3-9555-4D00-B577-2B1DBDD87CA7}</Project>
<Name>WebsitePanel.Server.Utils</Name>