From a5bd539b18a7eb4cb3286d4c4a1326338c9b9f4e Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Fri, 10 Dec 2010 15:16:18 -0800
Subject: [PATCH] Going back to Azure SDK 1.2 for the moment

--HG--
branch : dev
---
 ClickToRunAzureInDevFabric.cmd                       |  2 +-
 src/Orchard.Azure.Tests/App.config                   |  2 +-
 src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj   |  2 +-
 .../ServiceConfiguration.cscfg                       |  3 +--
 .../ServiceDefinition.csdef                          | 12 ++----------
 .../Orchard.Azure.Web/Orchard.Azure.Web.csproj       |  2 +-
 src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs       |  5 +----
 src/Orchard.Azure/Orchard.Azure.csproj               |  2 +-
 8 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/ClickToRunAzureInDevFabric.cmd b/ClickToRunAzureInDevFabric.cmd
index 3e1ba1773..c0a35a30e 100644
--- a/ClickToRunAzureInDevFabric.cmd
+++ b/ClickToRunAzureInDevFabric.cmd
@@ -1,5 +1,5 @@
 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 /run:"%CDIR %\build\Compile\Orchard.Azure.CloudService.csx";"%CDIR %\src\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg" /launchbrowser 
 pause
\ No newline at end of file
diff --git a/src/Orchard.Azure.Tests/App.config b/src/Orchard.Azure.Tests/App.config
index 41aa17680..dcb9cb146 100644
--- a/src/Orchard.Azure.Tests/App.config
+++ b/src/Orchard.Azure.Tests/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <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>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
diff --git a/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj b/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
index 355147332..ecdce0f39 100644
--- a/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
+++ b/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <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.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">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\moq\Moq.dll</HintPath>
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
index e49f9854e..0e71f7efb 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
@@ -1,9 +1,8 @@
 <?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">
     <Instances count="1" />
     <ConfigurationSettings>
-      <Setting name="DiagnosticsConnectionString" value="UseDevelopmentStorage=true" />
       <Setting name="DataConnectionString" value="UseDevelopmentStorage=true" />
     </ConfigurationSettings>
   </Role>
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
index 62fdd5deb..0cc371c69 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
   <WebRole name="Orchard.Azure.Web">
-    <!--<Sites>
-      <Site name="Web">
-        <Bindings>
-          <Binding name="HttpIn" endpointName="HttpIn" />
-        </Bindings>
-      </Site>
-    </Sites>-->
     <ConfigurationSettings>
-      <Setting name="DiagnosticsConnectionString" />
       <Setting name="DataConnectionString" />
     </ConfigurationSettings>
-    <Endpoints>
+    <InputEndpoints>
       <InputEndpoint name="HttpIn" protocol="http" port="80" />
-    </Endpoints>
+    </InputEndpoints>
   </WebRole>
 </ServiceDefinition>
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 4db91e723..dd2703ca9 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -58,7 +58,7 @@
     <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>False</Private>
     </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">
       <HintPath>..\..\..\lib\fluentnhibernate\NHibernate.ByteCode.Castle.dll</HintPath>
     </Reference>
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs b/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs
index ad0306387..4db62c516 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs
+++ b/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs
@@ -1,13 +1,10 @@
 using System.Linq;
 using Microsoft.WindowsAzure;
-using Microsoft.WindowsAzure.Diagnostics;
 using Microsoft.WindowsAzure.ServiceRuntime;
 
 namespace Orchard.Azure.Web {
     public class WebRole : RoleEntryPoint {
         public override bool OnStart() {
-            DiagnosticMonitor.Start("DiagnosticsConnectionString");
-
             CloudStorageAccount.SetConfigurationSettingPublisher(    
                 (configName, configSetter) =>    
                     configSetter(RoleEnvironment.GetConfigurationSettingValue(configName))    
@@ -20,7 +17,7 @@ namespace Orchard.Azure.Web {
             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 ( e.Changes.Any(change => change is RoleEnvironmentConfigurationSettingChange) ) {
                 // Set e.Cancel to true to restart this role instance
diff --git a/src/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Azure/Orchard.Azure.csproj
index 01dd0d140..b70945429 100644
--- a/src/Orchard.Azure/Orchard.Azure.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.csproj
@@ -54,7 +54,7 @@
   </PropertyGroup>
   <ItemGroup>
     <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.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>