Updating Azure project with SDK v1.3

Reflecting changes from Orchard project --HG-- branch : dev
2025-10-14 10:54:50 +08:00 · 2010-12-07 21:38:28 -08:00
parent 259b465fd3
commit 7ed0836f7e
13 changed files with 86 additions and 92 deletions
--- a/.hgignore
+++ b/.hgignore
@@ -19,3 +19,4 @@ glob:*.orig
 glob:*.suo
 glob:src/Orchard.Web/Modules-temp/*
 glob:*.itrace.csdef
+glob:*.build.csdef
--- a/AzurePackage.proj
+++ b/AzurePackage.proj
@@ -136,7 +136,7 @@
  <Target Name="Package-Stage">
 
    <Exec 
-      Command="&quot;$(ServiceHostingSDKBinDir)cspack&quot; &quot;$(ServiceFolder)\ServiceDefinition.csdef&quot; /role:Orchard.Azure.Web;&quot;$(CloudRootFolder)&quot;;Orchard.Azure.Web.dll /rolePropertiesFile:Orchard.Azure.Web;&quot;$(ServiceFolder)\Properties.txt&quot; /out:&quot;$(StageFolder)\Orchard.Azure.Web.cspkg&quot;" 
+      Command="&quot;$(ServiceHostingSDKBinDir)cspack&quot; &quot;$(ServiceFolder)\ServiceDefinition.build.csdef&quot; /role:Orchard.Azure.Web;&quot;$(CloudRootFolder)&quot;;Orchard.Azure.Web.dll /rolePropertiesFile:Orchard.Azure.Web;&quot;$(ServiceFolder)\Properties.txt&quot; /out:&quot;$(StageFolder)\Orchard.Azure.Web.cspkg&quot;" 
      WorkingDirectory="$(CloudRootFolder)" 
    />

--- a/src/Orchard.Azure.Tests/App.config
+++ b/src/Orchard.Azure.Tests/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
  <appSettings>
-    <add key="AzureSDK" value="C:\Program Files\Windows Azure SDK\v1.2\"/>
+    <add key="AzureSDK" value="C:\Program Files\Windows Azure SDK\v1.3\"/>
  </appSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
--- 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.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="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\lib\moq\Moq.dll</HintPath>
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>1.0.0</ProductVersion>
+    <ProductVersion>1.3.0</ProductVersion>
    <ProjectGuid>{03c5327d-4e8e-45a7-acd1-e18e7caa3c4a}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
  <WebRole name="Orchard.Azure.Web">
-    <InputEndpoints>
-      <InputEndpoint name="HttpIn" protocol="http" port="80" />
-    </InputEndpoints>
+    <Sites>
+      <Site name="Web">
+        <Bindings>
+          <Binding name="HttpIn" endpointName="HttpIn" />
+        </Bindings>
+      </Site>
+    </Sites>
    <ConfigurationSettings>
      <Setting name="DiagnosticsConnectionString" />
      <Setting name="DataConnectionString" />
    </ConfigurationSettings>
+    <Endpoints>
+      <InputEndpoint name="HttpIn" protocol="http" port="80" />
+    </Endpoints>
  </WebRole>
 </ServiceDefinition>
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
@@ -1,22 +0,0 @@
-<system.diagnostics>
-  <sources>
-    <source name="Default" switchValue="Verbose">
-      <listeners>
-        <add name="AzureDiagnostics" />
-      </listeners>
-    </source>
-    <source name="Orchard.Localization" switchValue="Verbose">
-      <listeners>
-        <add name="AzureDiagnostics" />
-      </listeners>
-    </source>
-    <source name="Orchard.Data.SessionLocator" switchValue="Verbose">
-      <listeners>
-        <add name="AzureDiagnostics" />
-      </listeners>
-    </source>
-  </sources>
-  <sharedListeners>
-    <add name="AzureDiagnostics" type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-  </sharedListeners>
-</system.diagnostics>
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/log4net.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/log4net.config
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+  <root>
+    <!-- Value of priority may be ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF -->
+    <priority value="WARN" />
+    <appender-ref ref="RollingLogFileAppender" />
+  </root>
+
+  <logger name="Orchard.Localization">
+    <priority value="WARN" />
+    <appender-ref ref="RollingLogFileAppender" />
+  </logger>
+
+  <logger name="Orchard.Data.SessionLocator">
+    <priority value="INFO" />
+    <appender-ref ref="RollingLogFileAppender" />
+  </logger>
+
+  <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+    <file value="App_Data/Logs/orchard-debug.txt" />
+    <appendToFile value="true" />
+    <immediateFlush value="true" />
+
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="%logger - %message%newline" />
+    </layout>
+  </appender>
+</log4net>
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -54,7 +54,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.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="NHibernate.ByteCode.Castle">
      <HintPath>..\..\..\lib\fluentnhibernate\NHibernate.ByteCode.Castle.dll</HintPath>
    </Reference>
@@ -71,11 +71,7 @@
    <Reference Include="System.Data.DataSetExtensions">
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, PublicKeyToken=89845dcd8080cc91" />
    <Reference Include="System.Web.ApplicationServices">
      <Private>False</Private>
    </Reference>
@@ -154,11 +150,6 @@
    <Content Include="Default.aspx" />
    <Content Include="Global.asax" />
  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\Diagnostics.config">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
  <ItemGroup>
    <Content Include="Config\Host.config">
      <SubType>Designer</SubType>
@@ -313,14 +304,7 @@
    </Content>
  </ItemGroup>
  <ItemGroup>
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
+    <Content Include="Config\log4net.config" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.Debug.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.Debug.config
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <system.web.extensions xdt:Transform="Remove" />
-</configuration>
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.Release.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.Release.config
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <system.web.extensions xdt:Transform="Remove" />
-</configuration>
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
    Note: As an alternative to hand editing this file you can use the 
    web admin tool to configure settings for your application. Use
@@ -13,9 +13,14 @@
      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor" requirePermission="false" />
      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false" />
    </sectionGroup>
+
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" requirePermission="false" />
  </configSections>

-  <system.diagnostics configSource="Config\Diagnostics.config"/>
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+    <add key="log4net.Config" value="Config\log4net.config" />
+  </appSettings>

  <system.web.webPages.razor>
    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
@@ -107,6 +112,7 @@
        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>
+    
    <httpHandlers>
      <!-- see below -->
      <clear />
@@ -115,12 +121,12 @@

    </httpHandlers>
  </system.web>
-  <system.web.extensions/>
  <!-- 
        The system.webServer section is required for running ASP.NET AJAX under Internet
        Information Services 7.0.  It is not necessary for previous version of IIS.
  -->
  <system.webServer>
+    
    <validation validateIntegratedModeConfiguration="false" />
    <modules runAllManagedModulesForAllRequests="true" />
    <handlers accessPolicy="Script">
--- 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.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="System" />
    <Reference Include="System.Core">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>