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

ClickToBuildAzurePackage.cmd

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

Orchard.proj

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