Minor improvements

* Calling stream.copyto only if length check passes * Adding Document Format module via nget
digi-lab-io · Jul 28, 2015 · 0ee4e7e · 0ee4e7e
1 parent 0d1e9f3
commit 0ee4e7e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/docxmerger/DocxMerger.csproj b/docxmerger/DocxMerger.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -24,7 +25,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -53,6 +53,10 @@
     <StartupObject>DocxMerger.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
     <Reference Include="OpenXmlPowerTools">
       <HintPath>..\packages\OpenXmlPowerTools.3.1.09\lib\OpenXmlPowerTools.dll</HintPath>
     </Reference>

diff --git a/docxmerger/Program.cs b/docxmerger/Program.cs
@@ -37,10 +37,10 @@ static void mergeDocx(string paramOutputFile, List<FileStream> paramDocumentstre
             foreach (var stream in paramDocumentstreams)
             {
                 var tempms = new MemoryStream();
-                stream.CopyTo(tempms);
 
                 if (0 != stream.Length)
                 {
+                    stream.CopyTo(tempms);
                     WmlDocument doc = new WmlDocument(stream.Length.ToString(), tempms);
                     sources.Add(new Source(doc, true));
                 }

diff --git a/docxmerger/Properties/AssemblyInfo.cs b/docxmerger/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.2")]
diff --git a/docxmerger/packages.config b/docxmerger/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
   <package id="OpenXmlPowerTools" version="3.1.09" targetFramework="net40" />
 </packages>