lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Orchard.proj and ClickToBuildAzurePackage.cmd: Fixing references related to building the Azure solution. Fixes #6628

Browse Source
This commit is contained in:
Lombiq
2016-03-25 15:31:39 +01:00
committed by Benedek Farkas
parent ede741b9df
commit 783d569434
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ClickToBuildAzurePackage.cmd
View File

@@ -2,5 +2,4 @@ SET target=%1
IF "%target%"=="" SET target=Build IF "%target%"=="" SET target=Build
ClickToBuild %target% AzurePackage.proj ClickToBuild %target% Orchard.proj src\Orchard.Azure\Orchard.Azure.sln

8
Orchard.proj
View File

@@ -6,6 +6,7 @@
<PropertyGroup> <PropertyGroup>
<LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder> <LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder>
<SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder> <SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder>
<AzureSrcFolder>$(SrcFolder)\Orchard.Azure</AzureSrcFolder>
<BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder> <BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder>
<MsBuildTasksFolder>$(MSBuildProjectDirectory)\buildtasks</MsBuildTasksFolder> <MsBuildTasksFolder>$(MSBuildProjectDirectory)\buildtasks</MsBuildTasksFolder>
<ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts</ArtifactsFolder> <ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts</ArtifactsFolder>
@@ -30,6 +31,7 @@
<Configuration Condition="$(Configuration) == ''">Release</Configuration> <Configuration Condition="$(Configuration) == ''">Release</Configuration>
<OrchardSolution>$(SrcFolder)\Orchard.sln</OrchardSolution> <OrchardSolution>$(SrcFolder)\Orchard.sln</OrchardSolution>
<OrchardAzureSolution>$(AzureSrcFolder)\Orchard.Azure.sln</OrchardAzureSolution>
<Solution Condition="$(Solution) == ''">$(OrchardSolution)</Solution> <Solution Condition="$(Solution) == ''">$(OrchardSolution)</Solution>
<!-- TeamCity build number --> <!-- TeamCity build number -->
@@ -98,12 +100,12 @@
</Target> </Target>
<Target Name="AzureBuild"> <Target Name="AzureBuild">
<MSBuild Projects="AzurePackage.proj" Targets="Build"> <MSBuild Projects="$(OrchardAzureSolution)" Targets="Build">
</MSBuild> </MSBuild>
</Target> </Target>
<Target Name="AzureCIBuild"> <Target Name="AzureCIBuild">
<MSBuild Projects="AzurePackage.proj" Targets="CIBuild"> <MSBuild Projects="$(OrchardAzureSolution)" Targets="CIBuild">
</MSBuild> </MSBuild>
</Target> </Target>
@@ -353,7 +355,7 @@
$(MSBuildProjectDirectory)\**\*.hgignore; $(MSBuildProjectDirectory)\**\*.hgignore;
$(MSBuildProjectDirectory)\**\*.hg*\**\*; $(MSBuildProjectDirectory)\**\*.hg*\**\*;
$(LibFolder)\nunit\addins\**\*; $(LibFolder)\nunit\addins\**\*;
" Exclude="$(MSBuildProjectDirectory)\src\Orchard.Azure\Orchard.Azure.CloudService\*Content\**\*" /> " Exclude="$(AzureSrcFolder)\Orchard.Azure.CloudService\*Content\**\*" />
<Zip-Stage Include="$(StageFolder)\**\*" /> <Zip-Stage Include="$(StageFolder)\**\*" />