Some fixes for Deploy.proj.

henon · May 8, 2010 · 44fc7b2 · 44fc7b2
1 parent 1a0c9b0
commit 44fc7b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/Deploy.proj b/Deploy.proj
@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
+    <ExtensionTasksPath>$(MSBuildProjectDirectory)\tools\MSBuild.ExtensionPack</ExtensionTasksPath>
     <DeployPath>$(MSBuildProjectDirectory)\deploy</DeployPath>
     <DeployTmp>$(DeployPath)\tmp</DeployTmp>
     <SourceProject>$(MSBuildProjectDirectory)\MongoDB-CSharp.sln</SourceProject>
@@ -17,21 +18,27 @@
       <ProjectToBuild Include="$(MSBuildProjectDirectory)\source\MongoDB\MongoDB.csproj" />
       <ProjectToBuild Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\MongoDB.GridFS.csproj" />
     </ItemGroup>
-    
+
     <MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild" Properties="Configuration=Release" />
-    
+
   </Target>
 
   <Target Name="deploy" DependsOnTargets="releasebuild">
 
+    <PropertyGroup>
+      <DeployFile>$(DeployPath)\MongoDB-CSharp.zip</DeployFile>
+    </PropertyGroup>
+
+    <Delete Files="$(DeployFile)" />
+
     <MakeDir Directories="$(DeployPath)" Condition="!Exists('$(DeployPath)')" />
     <MakeDir Directories="$(DeployTmp)" Condition="!Exists('$(DeployTmp)')" />
 
     <ItemGroup>
-      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB\bin\Debug\*.dll" />
-      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB\bin\Debug\*.xml" />
-      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\bin\Debug\*.dll" />
-      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\bin\Debug\*.xml" />
+      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB\bin\Release\*.xml" />
+      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB\bin\Release\*.dll" />
+      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\bin\Release\*.xml" />
+      <CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\bin\Release\*.dll" />
       <CollectFiles Include="$(MSBuildProjectDirectory)\LICENSE" />
       <CollectFiles Include="$(MSBuildProjectDirectory)\README.rst" />
     </ItemGroup>
@@ -44,10 +51,11 @@
 
     <Zip Files="@(DeployFiles)"
          WorkingDirectory="$(DeployTmp)"
-         ZipFileName="$(DeployPath)\MongoDB-CSharp.zip"
+         ZipFileName="$(DeployFile)"
          ZipLevel="9" />
 
     <RemoveDir Directories="$(DeployTmp)" />
+
   </Target>
 
 </Project>
diff --git a/source/MongoDB.GridFS/MongoDB.GridFS.csproj b/source/MongoDB.GridFS/MongoDB.GridFS.csproj
@@ -51,7 +51,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Release</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

diff --git a/source/MongoDB/MongoDB.csproj b/source/MongoDB/MongoDB.csproj
@@ -71,7 +71,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Release</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>