diff --git a/Orchard.proj b/Orchard.proj
index 5f1ae878d..de2041f50 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -8,6 +8,7 @@
$(MSBuildProjectDirectory)\src
$(MSBuildProjectDirectory)\build
$(MSBuildProjectDirectory)\buildtasks
+ $(LibFolder)\msbuild
$(MSBuildProjectDirectory)\artifacts
$(MSBuildProjectDirectory)\lib\sqlce
$(ArtifactsFolder)\Source
@@ -33,7 +34,7 @@
$(BUILD_NUMBER)
-
+
@@ -338,6 +339,7 @@
$(MSBuildProjectDirectory)\src\**\bin\**\*;
$(MSBuildProjectDirectory)\src\**\obj\**\*;
$(MSBuildProjectDirectory)\**\App_Data\**\*;
+ $(MSBuildProjectDirectory)\**\node_modules\**\*;
$(MSBuildProjectDirectory)\**\_ReSharper*\**\*;
$(MSBuildProjectDirectory)\**\*.sln.cache;
$(MSBuildProjectDirectory)\**\*.suo;
@@ -369,8 +371,8 @@
-
-
+
+
diff --git a/lib/msbuild/ICSharpCode.SharpZipLib.dll b/lib/msbuild/ICSharpCode.SharpZipLib.dll
deleted file mode 100644
index bcdb00ea3..000000000
Binary files a/lib/msbuild/ICSharpCode.SharpZipLib.dll and /dev/null differ
diff --git a/lib/msbuild/Ionic.Zip.Reduced.dll b/lib/msbuild/Ionic.Zip.Reduced.dll
new file mode 100644
index 000000000..9622cc53e
Binary files /dev/null and b/lib/msbuild/Ionic.Zip.Reduced.dll differ
diff --git a/lib/msbuild/MSBuild.Community.Tasks.Targets b/lib/msbuild/MSBuild.Community.Tasks.Targets
index a04f036a0..b7ad52d62 100644
--- a/lib/msbuild/MSBuild.Community.Tasks.Targets
+++ b/lib/msbuild/MSBuild.Community.Tasks.Targets
@@ -1,116 +1,158 @@
-
+
-
-
- .
- $(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll
-
+
+ $(MSBuildThisFileDirectory)
+ $([MSBUILD]::Unescape($(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll))
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/msbuild/MSBuild.Community.Tasks.dll b/lib/msbuild/MSBuild.Community.Tasks.dll
index ee8046a1d..1288d54c1 100644
Binary files a/lib/msbuild/MSBuild.Community.Tasks.dll and b/lib/msbuild/MSBuild.Community.Tasks.dll differ