Merge branch 'master' into dev

This commit is contained in:
Sebastien Ros
2016-03-17 10:05:46 -07:00
11 changed files with 15 additions and 17 deletions

View File

@@ -323,6 +323,7 @@
<ItemGroup>
<Zip-Exclude Include="
$(MSBuildProjectDirectory)\src\**\packages\**\*;
$(MSBuildProjectDirectory)\src\**\bin\**\*;
$(MSBuildProjectDirectory)\src\**\obj\**\*;
$(MSBuildProjectDirectory)\**\App_Data\**\*;
@@ -339,7 +340,7 @@
<Zip-Stage Include="$(StageFolder)\**\*" />
<Zip-MsDeploy Include="$(MsDeployFolder)\**\*" />
<Zip-MsDeploy Include="$(MsDeployFolder)\**\*" Exclude="$(MSBuildProjectDirectory)\**\bin\**\*.pdb;"/>
<Zip-Source Include="
$(MSBuildProjectDirectory)\lib\**\*;