lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-18 17:47:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing Build script for Azure SDK 1.5

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-09-15 14:57:58 -07:00
parent 99b6ae6b47
commit 24605541d3
3 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
AzurePackage.proj
View File

@@ -14,11 +14,13 @@
<CloudRootFolder>$(ServiceFolder)\roles\Orchard.Azure.Web\approot</CloudRootFolder> <CloudRootFolder>$(ServiceFolder)\roles\Orchard.Azure.Web\approot</CloudRootFolder>
<WebSitesFolder>$(CompileFolder)\_PublishedWebsites</WebSitesFolder> <WebSitesFolder>$(CompileFolder)\_PublishedWebsites</WebSitesFolder>
<StageFolder>$(BuildFolder)\Stage</StageFolder> <StageFolder>$(BuildFolder)\Stage</StageFolder>
<MsDeployFolder>$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\obj\Release\Package\PackageTmp</MsDeployFolder>
</PropertyGroup> </PropertyGroup>
<Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/> <Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Windows Azure Tools\1.4\Microsoft.WindowsAzure.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Windows Azure Tools\1.5\Microsoft.WindowsAzure.targets" />
<!-- Coordinating Targets --> <!-- Coordinating Targets -->
<Target Name ="Build"> <Target Name ="Build">
@@ -47,19 +49,23 @@
<Target Name="Clean"> <Target Name="Clean">
<MSBuild Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.sln" Targets="Clean" /> <MSBuild Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.sln" Targets="Clean" />
<RemoveDir Directories="$(BuildFolder)" ContinueOnError="true" /> <RemoveDir Directories="$(BuildFolder)" ContinueOnError="true" />
<RemoveDir Directories="$(MsDeployFolder)" ContinueOnError="true" />
</Target> </Target>
<Target Name ="Compile"> <Target Name ="Compile">
<!-- behaves like MsDeploy since Azure SDK 1.4, output is $(MsDeployFolder) -->
<MSBuild <MSBuild
Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.sln" Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.sln"
Targets="Build" Targets="Build"
Properties="Configuration=Release;OutputPath=$(CompileFolder);PlatformTarget=x64" Properties="Configuration=Release;DeployOnBuild=true;DeployTarget=Package;PlatformTarget=x64"
/> />
<MSBuild <MSBuild
Projects="$(SrcFolder)\Orchard.Azure.Tests\Orchard.Azure.Tests.sln" Projects="$(SrcFolder)\Orchard.Azure.Tests\Orchard.Azure.Tests.sln"
Targets="Build" Targets="Build"
Properties="Configuration=Release;OutputPath=$(CompileFolder);PlatformTarget=x64" /> Properties="Configuration=Release;OutputPath=$(MsDeployFolder)\bin;PlatformTarget=x64"
/>
</Target> </Target>
@@ -72,7 +78,7 @@
<Output TaskParameter="Include" ItemName="TestAssemblies" /> <Output TaskParameter="Include" ItemName="TestAssemblies" />
</CreateItem> </CreateItem>
<NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" /> <NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(MsDeployFolder)\bin" />
</Target> </Target>
<!-- Packaging --> <!-- Packaging -->
@@ -80,48 +86,54 @@
<Target Name="Package-ForCloud"> <Target Name="Package-ForCloud">
<ItemGroup> <ItemGroup>
<!-- filter to exclude any binary from a folder -->
<Excluded Include="$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;" /> <Excluded Include="$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;" />
<!--
<Web-Excluded Include="$(SrcFolder)\**\_bin_deployableAssemblies\**\*;$(SrcFolder)\**\Properties\**\*;$(SrcFolder)\**\*.csproj*;$(SrcFolder)\**\*.proj;$(SrcFolder)\**\Modules\**\*;$(SrcFolder)\**\Core\**\*;$(SrcFolder)\**\Themes\**\*;$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;" /> <Web-Excluded Include="$(SrcFolder)\**\_bin_deployableAssemblies\**\*;$(SrcFolder)\**\Properties\**\*;$(SrcFolder)\**\*.csproj*;$(SrcFolder)\**\*.proj;$(SrcFolder)\**\Modules\**\*;$(SrcFolder)\**\Core\**\*;$(SrcFolder)\**\Themes\**\*;$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;" />
-->
<!-- list of files from Themes, Core and Modules to export -->
<Stage-Themes Include="$(SrcFolder)\Orchard.Web\Themes\**\*" Exclude="@(Excluded)" /> <Stage-Themes Include="$(SrcFolder)\Orchard.Web\Themes\**\*" Exclude="@(Excluded)" />
<Stage-Core Include="$(SrcFolder)\Orchard.Web\Core\**\*" Exclude="@(Excluded)" /> <Stage-Core Include="$(SrcFolder)\Orchard.Web\Core\**\*" Exclude="@(Excluded)" />
<Stage-Modules Include="$(SrcFolder)\Orchard.Web\Modules\**\*" Exclude="@(Excluded)" /> <Stage-Modules Include="$(SrcFolder)\Orchard.Web\Modules\**\*" Exclude="@(Excluded)" />
<Stage-Web Include="$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\**\*" Exclude="@(Web-Excluded)" /> <!--
<Stage-Assemblies Include="$(SrcFolder)\**\bin\**\*" /> <Stage-Web Include="$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\**\*" Exclude="@(Web-Excluded)" />
<Stage-Bin-Assemblies Include="$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\_bin_deployableAssemblies\*" /> <Stage-Assemblies Include="$(SrcFolder)\**\bin\**\*" />
<Stage-Entry-Assembly Include="$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\bin\Orchard.Azure.Web.dll" /> <Stage-Bin-Assemblies Include="$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\_bin_deployableAssemblies\*" />
<Stage-Entry-Assembly Include="$(CompileFolder)\Orchard.Azure.Web.dll" />
-->
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(Stage-Themes)" DestinationFolder="$(CloudRootFolder)\Themes\%(RecursiveDir)" /> <Copy SourceFiles="@(Stage-Themes)" DestinationFolder="$(MsDeployFolder)\Themes\%(RecursiveDir)" />
<Copy SourceFiles="@(Stage-Core)" DestinationFolder="$(CloudRootFolder)\Core\%(RecursiveDir)" /> <Copy SourceFiles="@(Stage-Core)" DestinationFolder="$(MsDeployFolder)\Core\%(RecursiveDir)" />
<Copy SourceFiles="@(Stage-Modules)" DestinationFolder="$(CloudRootFolder)\Modules\%(RecursiveDir)" /> <Copy SourceFiles="@(Stage-Modules)" DestinationFolder="$(MsDeployFolder)\Modules\%(RecursiveDir)" />
<!--
<Copy SourceFiles="@(Stage-Web)" DestinationFolder="$(CloudRootFolder)\%(RecursiveDir)" /> <Copy SourceFiles="@(Stage-Web)" DestinationFolder="$(CloudRootFolder)\%(RecursiveDir)" />
<Copy SourceFiles="@(Stage-Assemblies)" DestinationFolder="$(CloudRootFolder)\bin" /> <Copy SourceFiles="@(Stage-Assemblies)" DestinationFolder="$(CloudRootFolder)\bin" />
<Copy SourceFiles="@(Stage-Bin-Assemblies)" DestinationFolder="$(CloudRootFolder)\bin" /> <Copy SourceFiles="@(Stage-Bin-Assemblies)" DestinationFolder="$(CloudRootFolder)\bin" />
<Copy SourceFiles="@(Stage-Entry-Assembly)" DestinationFolder="$(CloudRootFolder)\" /> <Copy SourceFiles="@(Stage-Entry-Assembly)" DestinationFolder="$(CloudRootFolder)\" />
-->
<Delete Files="$(CloudRootFolder)\App_Data" /> <!--Delete Files="$(CloudRootFolder)\App_Data" /-->
<ItemGroup> <ItemGroup>
<WebConfigs Include="$(CloudRootFolder)\Modules\*\web.config;$(CloudRootFolder)\Core\web.config" /> <WebConfigs Include="$(MsDeployFolder)\Modules\*\web.config;$(MsDeployFolder)\Core\web.config" />
</ItemGroup> </ItemGroup>
<Delete Files="@(WebConfigs)" /> <Delete Files="@(WebConfigs)" />
<!-- extra processing of the staged config files --> <!-- extra processing of the staged config files -->
<XmlUpdate XmlFileName="$(CloudRootFolder)\web.config" <XmlUpdate XmlFileName="$(MsDeployFolder)\web.config"
XPath="/configuration/system.web/compilation/@debug" XPath="/configuration/system.web/compilation/@debug"
Value="false" /> Value="false" />
<XmlUpdate XmlFileName="$(CloudRootFolder)\Config\log4net.config" <XmlUpdate XmlFileName="$(MsDeployFolder)\Config\log4net.config"
XPath="/log4net/appender/immediateFlush/@value" XPath="/log4net/appender/immediateFlush/@value"
Value="false" /> Value="false" />
<XmlUpdate XmlFileName="$(CloudRootFolder)\Config\log4net.config" <XmlUpdate XmlFileName="$(MsDeployFolder)\Config\log4net.config"
XPath="/log4net/logger/priority/@value" XPath="/log4net/logger/priority/@value"
Value="ERROR" /> Value="ERROR" />
<XmlUpdate XmlFileName="$(CloudRootFolder)\Config\log4net.config" <XmlUpdate XmlFileName="$(MsDeployFolder)\Config\log4net.config"
XPath="/log4net/root/priority/@value" XPath="/log4net/root/priority/@value"
Value="ERROR" /> Value="ERROR" />
@@ -142,14 +154,14 @@
<SqlCeBinariesx86 Include="$(LibFolder)\sqlce\x86\**\*" /> <SqlCeBinariesx86 Include="$(LibFolder)\sqlce\x86\**\*" />
<SqlCeBinariesx64 Include="$(LibFolder)\sqlce\amd64\**\*" /> <SqlCeBinariesx64 Include="$(LibFolder)\sqlce\amd64\**\*" />
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(SqlCeBinariesx86)" DestinationFolder="$(CloudRootFolder)\bin\x86\%(RecursiveDir)" SkipUnchangedFiles="true" /> <Copy SourceFiles="@(SqlCeBinariesx86)" DestinationFolder="$(MsDeployFolder)\bin\x86\%(RecursiveDir)" SkipUnchangedFiles="true" />
<Copy SourceFiles="@(SqlCeBinariesx64)" DestinationFolder="$(CloudRootFolder)\bin\amd64\%(RecursiveDir)" SkipUnchangedFiles="true" /> <Copy SourceFiles="@(SqlCeBinariesx64)" DestinationFolder="$(MsDeployFolder)\bin\amd64\%(RecursiveDir)" SkipUnchangedFiles="true" />
</Target> </Target>
<Target Name="Package-Stage"> <Target Name="Package-Stage">
<Exec <Exec
Command="&quot;$(ServiceHostingSDKBinDir)cspack&quot; &quot;$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService\ServiceDefinition.build.csdef&quot; /role:Orchard.Azure.Web;&quot;$(CloudRootFolder)&quot;;Orchard.Azure.Web.dll /sites:Orchard.Azure.Web;Web;&quot;$(CloudRootFolder)&quot; /rolePropertiesFile:Orchard.Azure.Web;&quot;$(ServiceFolder)\Properties.txt&quot; /out:&quot;$(StageFolder)\Orchard.Azure.Web.cspkg&quot;" Command="&quot;$(ServiceHostingSDKBinDir)cspack&quot; &quot;$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService\ServiceDefinition.build.csdef&quot; /role:Orchard.Azure.Web;&quot;$(MsDeployFolder)&quot;;Orchard.Azure.Web.dll /sites:Orchard.Azure.Web;Web;&quot;$(MsDeployFolder)&quot; /rolePropertiesFile:Orchard.Azure.Web;&quot;$(ServiceFolder)\Properties.txt&quot; /out:&quot;$(StageFolder)\Orchard.Azure.Web.cspkg&quot;"
WorkingDirectory="$(CloudRootFolder)" WorkingDirectory="$(MsDeployFolder)"
/> />
</Target> </Target>

8
src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>1.3.0</ProductVersion> <ProductVersion>1.5.0</ProductVersion>
<ProjectGuid>{03c5327d-4e8e-45a7-acd1-e18e7caa3c4a}</ProjectGuid> <ProjectGuid>{03c5327d-4e8e-45a7-acd1-e18e7caa3c4a}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,7 +46,8 @@
</ItemGroup> </ItemGroup>
<!-- Import the target files for this project template --> <!-- Import the target files for this project template -->
<PropertyGroup> <PropertyGroup>
<CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\Cloud Service\1.0\Visual Studio 10.0\</CloudExtensionsDir> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\1.5\</CloudExtensionsDir>
</PropertyGroup> </PropertyGroup>
<Import Project="$(CloudExtensionsDir)Microsoft.CloudService.targets" /> <Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
</Project> </Project>

6
src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
View File

@@ -85,11 +85,7 @@
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, PublicKeyToken=89845dcd8080cc91" />
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.ApplicationServices"> <Reference Include="System.Web.ApplicationServices">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>