diff --git a/DiscImageChef.DiscImages/CHD.cs b/DiscImageChef.DiscImages/CHD.cs index 64d9a048b..0ae97ecd7 100644 --- a/DiscImageChef.DiscImages/CHD.cs +++ b/DiscImageChef.DiscImages/CHD.cs @@ -41,8 +41,8 @@ using DiscImageChef.Console; using DiscImageChef.Filters; using System.Linq; using System.Text; -using SharpCompress.Compressor.Deflate; -using SharpCompress.Compressor; +using SharpCompress.Compressors.Deflate; +using SharpCompress.Compressors; using System.Reflection; using System.Reflection.Emit; diff --git a/DiscImageChef.DiscImages/ChangeLog b/DiscImageChef.DiscImages/ChangeLog index 2a899e6d8..0ffc256a2 100644 --- a/DiscImageChef.DiscImages/ChangeLog +++ b/DiscImageChef.DiscImages/ChangeLog @@ -1,3 +1,13 @@ +2016-09-30 Natalia Portillo + + * CHD.cs: + * QCOW.cs: + * UDIF.cs: + * QCOW2.cs: + * packages.config: + * DiscImageChef.DiscImages.csproj: Updated SharpCompress to + 0.13.0 + 2016-09-07 Natalia Portillo * NDIF.cs: diff --git a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj index 3c414ce62..c586c52d2 100644 --- a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj +++ b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj @@ -35,7 +35,7 @@ ..\packages\plist-cil.1.14\lib\plist-cil.dll - ..\packages\SharpCompress.0.12.4\lib\net40\SharpCompress.dll + ..\packages\SharpCompress.0.13.0\lib\net40\SharpCompress.dll @@ -151,8 +151,8 @@ - - + + diff --git a/DiscImageChef.DiscImages/QCOW.cs b/DiscImageChef.DiscImages/QCOW.cs index d6662b6c5..e5ead8a09 100644 --- a/DiscImageChef.DiscImages/QCOW.cs +++ b/DiscImageChef.DiscImages/QCOW.cs @@ -37,8 +37,8 @@ using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; using DiscImageChef.Console; using DiscImageChef.Filters; -using SharpCompress.Compressor; -using SharpCompress.Compressor.Deflate; +using SharpCompress.Compressors; +using SharpCompress.Compressors.Deflate; namespace DiscImageChef.ImagePlugins { diff --git a/DiscImageChef.DiscImages/QCOW2.cs b/DiscImageChef.DiscImages/QCOW2.cs index 9e75e2ad6..baff9ab1b 100644 --- a/DiscImageChef.DiscImages/QCOW2.cs +++ b/DiscImageChef.DiscImages/QCOW2.cs @@ -37,8 +37,8 @@ using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; using DiscImageChef.Console; using DiscImageChef.Filters; -using SharpCompress.Compressor; -using SharpCompress.Compressor.Deflate; +using SharpCompress.Compressors; +using SharpCompress.Compressors.Deflate; namespace DiscImageChef.ImagePlugins { diff --git a/DiscImageChef.DiscImages/UDIF.cs b/DiscImageChef.DiscImages/UDIF.cs index 01dcc7579..0c1abbdf4 100644 --- a/DiscImageChef.DiscImages/UDIF.cs +++ b/DiscImageChef.DiscImages/UDIF.cs @@ -40,8 +40,9 @@ using DiscImageChef.CommonTypes; using DiscImageChef.Console; using DiscImageChef.ImagePlugins; using DiscImageChef.Filters; -using SharpCompress.Compressor.Deflate; -using SharpCompress.Compressor.BZip2; +using SharpCompress.Compressors.Deflate; +using SharpCompress.Compressors.BZip2; +using SharpCompress.Compressors; namespace DiscImageChef.DiscImages { @@ -559,9 +560,9 @@ namespace DiscImageChef.DiscImages Stream decStream; if(currentChunk.type == ChunkType_Zlib) - decStream = new ZlibStream(cmpMs, SharpCompress.Compressor.CompressionMode.Decompress); + decStream = new ZlibStream(cmpMs, CompressionMode.Decompress); else if(currentChunk.type == ChunkType_Bzip) - decStream = new BZip2Stream(cmpMs, SharpCompress.Compressor.CompressionMode.Decompress); + decStream = new BZip2Stream(cmpMs, CompressionMode.Decompress); else throw new ImageNotSupportedException(string.Format("Unsupported chunk type 0x{0:X8} found", currentChunk.type)); diff --git a/DiscImageChef.DiscImages/packages.config b/DiscImageChef.DiscImages/packages.config index e3e5017f5..123fa1c29 100644 --- a/DiscImageChef.DiscImages/packages.config +++ b/DiscImageChef.DiscImages/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/DiscImageChef.Filters/BZip2.cs b/DiscImageChef.Filters/BZip2.cs index 17a9e14a0..e63089331 100644 --- a/DiscImageChef.Filters/BZip2.cs +++ b/DiscImageChef.Filters/BZip2.cs @@ -32,8 +32,8 @@ using System; using System.IO; -using SharpCompress.Compressor; -using SharpCompress.Compressor.BZip2; +using SharpCompress.Compressors; +using SharpCompress.Compressors.BZip2; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Filters/ChangeLog b/DiscImageChef.Filters/ChangeLog index ecb7905f4..ec379a77c 100644 --- a/DiscImageChef.Filters/ChangeLog +++ b/DiscImageChef.Filters/ChangeLog @@ -1,3 +1,10 @@ +2016-09-30 Natalia Portillo + + * BZip2.cs: + * packages.config: + * DiscImageChef.Filters.csproj: Updated SharpCompress to + 0.13.0 + 2016-09-07 Natalia Portillo * MacBinary.cs: diff --git a/DiscImageChef.Filters/DiscImageChef.Filters.csproj b/DiscImageChef.Filters/DiscImageChef.Filters.csproj index e6e901233..cb8facf4c 100644 --- a/DiscImageChef.Filters/DiscImageChef.Filters.csproj +++ b/DiscImageChef.Filters/DiscImageChef.Filters.csproj @@ -31,7 +31,7 @@ - ..\packages\SharpCompress.0.12.4\lib\net40\SharpCompress.dll + ..\packages\SharpCompress.0.13.0\lib\net40\SharpCompress.dll @@ -71,8 +71,8 @@ - - + + diff --git a/DiscImageChef.Filters/packages.config b/DiscImageChef.Filters/packages.config index c9fc53f5f..8a7acdf51 100644 --- a/DiscImageChef.Filters/packages.config +++ b/DiscImageChef.Filters/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file