Merge branch 'development' of https://git01.codeplex.com/casablanca into development

Author: arturl

Build/Common.Build.settings

@@ -9,6 +9,12 @@
     </MSBuildAllProjects>
   </PropertyGroup>
 
+  <!-- default configuration -->
+  <PropertyGroup>
+    <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
+    <Platform Condition="'$(Platform)'==''">Win32</Platform>
+  </PropertyGroup>
+  
   <!-- for root paths -->
   <PropertyGroup>
     <BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
@@ -51,8 +57,6 @@
 
   <PropertyGroup>
     <BinaryDependencies>$(TargetsPath)\BinaryDependencies</BinaryDependencies>
-    <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
-    <Platform Condition="'$(Platform)'==''">Win32</Platform>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
 

Release/setup/CasablancaSetup.wixproj

@@ -1,5 +1,8 @@
-<Project DefaultTargets="CheckVSTargetVersion;Build;Report" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="CheckVSTargetVersion;MakeZip;Build;Report" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+        <Target Name="MakeZip">
+		    <MSBuild Projects="$(CollateralsDir)\MakeZip\MakeZip.proj"/>
+        </Target>
         <Target Name="CheckVSTargetVersion">
             <Message Text="Checking VSTargetVersion..."/>
             <Error
@@ -82,6 +85,5 @@
             <Name>WixUtilExtension</Name>
           </WixExtension>
         </ItemGroup>
-
         <Import Project="$(WixTargetsPath)" />
-</Project>
+</Project>

Release/setup/dirs.proj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <ProjectFile Include="$(BuildRoot)\Release\Collateral\MakeZip\MakeZip.proj"/>
+      <ProjectFile Include="$(CollateralsDir)\MakeZip\MakeZip.proj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32' AND '$(DevToolsVersion)' == '100'">