Remove dependency on MSBuild.Community.Tasks

terrajobst · Apr 14, 2013 · a95249f · a95249f
1 parent c40b53f
commit a95249f
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 4 deletions.
diff --git a/Build/Build.proj b/Build/Build.proj
@@ -27,8 +27,8 @@
 
   <UsingTask AssemblyFile="$(CustomTasksDir)XsdDocumentation.Build.dll"
              TaskName="XsdDocumentation.Build.GetFileVersionInfo" />
-  <UsingTask AssemblyFile="$(LibDir)MSBuildCommunityTasks\MSBuild.Community.Tasks.dll"
-             TaskName="MSBuild.Community.Tasks.Zip" />
+  <UsingTask AssemblyFile="$(CustomTasksDir)XsdDocumentation.Build.dll"
+             TaskName="XsdDocumentation.Build.Zip" />
 
   <!-- Build -->
 
@@ -213,7 +213,7 @@
 
   <!-- Generate Release -->
 
-  <Target Name="GenerateRelease">
+  <Target Name="GenerateRelease" DependsOnTargets="CompileBuildTasks">
     <ItemGroup>
       <GeneratedBuildServerFiles Include="$(GeneratedBinaries)\**\*.*" />
       <GeneratedSourceCodeFiles Include="$(GeneratedSourceCode)\**\*.*" />

diff --git a/Lib/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll b/Lib/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll
diff --git a/Source/XsdDocumentation.Build/XsdDocumentation.Build.csproj b/Source/XsdDocumentation.Build/XsdDocumentation.Build.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XsdDocumentation.Build</RootNamespace>
     <AssemblyName>XsdDocumentation.Build</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +33,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Code Analysis|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,19 +44,23 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="GetFileVersion.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Zip.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Source/XsdDocumentation.Build/Zip.cs b/Source/XsdDocumentation.Build/Zip.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace XsdDocumentation.Build
+{
+    public sealed class Zip : Task
+    {
+        public ITaskItem WorkingDirectory { get; set; }
+
+        [Required]
+        public ITaskItem ZipFileName { get; set; }
+
+        [Required]
+        public ITaskItem[] Files { get; set; }
+
+        public override bool Execute()
+        {
+            try
+            {
+                var workingDirectory = WorkingDirectory.ItemSpec;
+                var zipFileName = ZipFileName.ItemSpec;
+                var fileNames = Files.Select(f => f.ItemSpec);
+                CreateZipArchive(workingDirectory, zipFileName, fileNames);
+
+            }
+            catch (Exception ex)
+            {
+                Log.LogErrorFromException(ex);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        private static void CreateZipArchive(string workingDirectory, string zipFileName, IEnumerable<string> fileNames)
+        {
+            using (var fileStream = File.Create(zipFileName))
+            using (var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Create))
+            {
+                foreach (var fileName in fileNames)
+                {
+                    var relativePath = GetRelativePath(fileName, workingDirectory);
+                    zipArchive.CreateEntryFromFile(fileName, relativePath, CompressionLevel.Optimal);
+                }
+            }
+        }
+
+        private static string GetRelativePath(string fileName, string workingDirectory)
+        {
+            if (!fileName.StartsWith(workingDirectory, StringComparison.OrdinalIgnoreCase))
+                return Path.GetFileName(fileName);
+
+            var backslashCompensation = workingDirectory.EndsWith("\\") ? 1 : 0;
+            return fileName.Substring(workingDirectory.Length + backslashCompensation);
+        }
+    }
+}