Changed back to SharpCompress as it is now updated with support for zip64

4 files changed, 6 insertions, 8 deletions

diff --git a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj
index 2871f64df..e244d9fda 100644
--- a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj
+++ b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj
@@ -42,7 +42,7 @@
       <HintPath>..\..\..\thirdparty\ManagedLZMA\managed-lzma.dll</HintPath>

     </Reference>

     <Reference Include="SharpCompress">

-      <HintPath>..\..\..\thirdparty\SharpCompress\SharpCompress.dll</HintPath>

+      <HintPath>..\..\..\packages\SharpCompress.0.16.2\lib\net45\SharpCompress.dll</HintPath>

     </Reference>

   </ItemGroup>

   <ItemGroup>

@@ -74,6 +74,7 @@
   <ItemGroup>

     <None Include="app.config" />

     <None Include="Duplicati.snk" />

+    <None Include="packages.config" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Duplicati/Library/Compression/packages.config b/Duplicati/Library/Compression/packages.config
new file mode 100644
index 000000000..1b9b119e8
--- /dev/null
+++ b/Duplicati/Library/Compression/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="SharpCompress" version="0.16.2" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/thirdparty/SharpCompress/README.txt b/thirdparty/SharpCompress/README.txt
deleted file mode 100644
index 99a30080c..000000000
--- a/thirdparty/SharpCompress/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The SharpCompress.dll file in this folder is a build from:
-https://github.com/adamhathcock/sharpcompress/commit/356c977cff161166f91f1db6bb96fe185e5d793a
-
-This is required to include the zip64 fixes implemented here:
-https://github.com/adamhathcock/sharpcompress/commit/f8538403e4697a7a0f582d4fafb58b79dce2750d
-
-Once a SharpCompress version > 0.15.2 is released, that version should be used instead.
\ No newline at end of file
diff --git a/thirdparty/SharpCompress/SharpCompress.dll b/thirdparty/SharpCompress/SharpCompress.dll
deleted file mode 100755
index 703a02779..000000000
--- a/thirdparty/SharpCompress/SharpCompress.dll
+++ /dev/null