mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-14 10:54:50 +08:00
Going back to Azure SDK 1.2 for the moment
--HG-- branch : dev
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
SET CDIR = %CD%
|
SET CDIR = %CD%
|
||||||
call "%ProgramFiles%\Windows Azure SDK\v1.3\bin\setenv.cmd"
|
call "%ProgramFiles%\Windows Azure SDK\v1.2\bin\setenv.cmd"
|
||||||
csrun /devstore
|
csrun /devstore
|
||||||
csrun /run:"%CDIR %\build\Compile\Orchard.Azure.CloudService.csx";"%CDIR %\src\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg" /launchbrowser
|
csrun /run:"%CDIR %\build\Compile\Orchard.Azure.CloudService.csx";"%CDIR %\src\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg" /launchbrowser
|
||||||
pause
|
pause
|
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="AzureSDK" value="C:\Program Files\Windows Azure SDK\v1.3\"/>
|
<add key="AzureSDK" value="C:\Program Files\Windows Azure SDK\v1.2\"/>
|
||||||
</appSettings>
|
</appSettings>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
|
||||||
|
@@ -55,7 +55,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
<Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\lib\moq\Moq.dll</HintPath>
|
<HintPath>..\..\lib\moq\Moq.dll</HintPath>
|
||||||
|
@@ -1,9 +1,8 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<ServiceConfiguration serviceName="OrchardCloudService" osFamily="1" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration">
|
<ServiceConfiguration serviceName="OrchardCloudService" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration">
|
||||||
<Role name="Orchard.Azure.Web">
|
<Role name="Orchard.Azure.Web">
|
||||||
<Instances count="1" />
|
<Instances count="1" />
|
||||||
<ConfigurationSettings>
|
<ConfigurationSettings>
|
||||||
<Setting name="DiagnosticsConnectionString" value="UseDevelopmentStorage=true" />
|
|
||||||
<Setting name="DataConnectionString" value="UseDevelopmentStorage=true" />
|
<Setting name="DataConnectionString" value="UseDevelopmentStorage=true" />
|
||||||
</ConfigurationSettings>
|
</ConfigurationSettings>
|
||||||
</Role>
|
</Role>
|
||||||
|
@@ -1,19 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
|
<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
|
||||||
<WebRole name="Orchard.Azure.Web">
|
<WebRole name="Orchard.Azure.Web">
|
||||||
<!--<Sites>
|
|
||||||
<Site name="Web">
|
|
||||||
<Bindings>
|
|
||||||
<Binding name="HttpIn" endpointName="HttpIn" />
|
|
||||||
</Bindings>
|
|
||||||
</Site>
|
|
||||||
</Sites>-->
|
|
||||||
<ConfigurationSettings>
|
<ConfigurationSettings>
|
||||||
<Setting name="DiagnosticsConnectionString" />
|
|
||||||
<Setting name="DataConnectionString" />
|
<Setting name="DataConnectionString" />
|
||||||
</ConfigurationSettings>
|
</ConfigurationSettings>
|
||||||
<Endpoints>
|
<InputEndpoints>
|
||||||
<InputEndpoint name="HttpIn" protocol="http" port="80" />
|
<InputEndpoint name="HttpIn" protocol="http" port="80" />
|
||||||
</Endpoints>
|
</InputEndpoints>
|
||||||
</WebRole>
|
</WebRole>
|
||||||
</ServiceDefinition>
|
</ServiceDefinition>
|
@@ -58,7 +58,7 @@
|
|||||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="NHibernate.ByteCode.Castle">
|
<Reference Include="NHibernate.ByteCode.Castle">
|
||||||
<HintPath>..\..\..\lib\fluentnhibernate\NHibernate.ByteCode.Castle.dll</HintPath>
|
<HintPath>..\..\..\lib\fluentnhibernate\NHibernate.ByteCode.Castle.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
@@ -1,13 +1,10 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Microsoft.WindowsAzure;
|
using Microsoft.WindowsAzure;
|
||||||
using Microsoft.WindowsAzure.Diagnostics;
|
|
||||||
using Microsoft.WindowsAzure.ServiceRuntime;
|
using Microsoft.WindowsAzure.ServiceRuntime;
|
||||||
|
|
||||||
namespace Orchard.Azure.Web {
|
namespace Orchard.Azure.Web {
|
||||||
public class WebRole : RoleEntryPoint {
|
public class WebRole : RoleEntryPoint {
|
||||||
public override bool OnStart() {
|
public override bool OnStart() {
|
||||||
DiagnosticMonitor.Start("DiagnosticsConnectionString");
|
|
||||||
|
|
||||||
CloudStorageAccount.SetConfigurationSettingPublisher(
|
CloudStorageAccount.SetConfigurationSettingPublisher(
|
||||||
(configName, configSetter) =>
|
(configName, configSetter) =>
|
||||||
configSetter(RoleEnvironment.GetConfigurationSettingValue(configName))
|
configSetter(RoleEnvironment.GetConfigurationSettingValue(configName))
|
||||||
@@ -20,7 +17,7 @@ namespace Orchard.Azure.Web {
|
|||||||
return base.OnStart();
|
return base.OnStart();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RoleEnvironmentChanging(object sender, RoleEnvironmentChangingEventArgs e) {
|
private static void RoleEnvironmentChanging(object sender, RoleEnvironmentChangingEventArgs e) {
|
||||||
// If a configuration setting is changing
|
// If a configuration setting is changing
|
||||||
if ( e.Changes.Any(change => change is RoleEnvironmentConfigurationSettingChange) ) {
|
if ( e.Changes.Any(change => change is RoleEnvironmentConfigurationSettingChange) ) {
|
||||||
// Set e.Cancel to true to restart this role instance
|
// Set e.Cancel to true to restart this role instance
|
||||||
|
@@ -54,7 +54,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core">
|
<Reference Include="System.Core">
|
||||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||||
|
Reference in New Issue
Block a user