starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-25 00:15:15 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge pull request #122 from benshoof/net35_compat

Browse Source 
Added support for .NET 3.5
This commit is contained in:
Adam Hathcock
2016-01-26 21:00:20 +00:00
parent 2e8844c896 42c4eab4be
commit fe8da55c95
9 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SharpCompress/Archive/IWritableArchive.Extensions.cs
View File

@@ -60,7 +60,7 @@ namespace SharpCompress.Archive
this IWritableArchive writableArchive,
string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
{
#if NET2
#if NET35
foreach (var path in Directory.GetFiles(filePath, searchPattern, searchOption))
#else
foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))

2
SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs
View File

@@ -93,7 +93,7 @@ namespace SharpCompress.Common.Rar.Headers
{
if (!Options.HasFlag(Options.KeepStreamsOpen))
{
#if NET2
#if NET35
reader.Close();
#else
reader.Dispose();

6
SharpCompress/EnumExtensions.cs
View File

@@ -1,4 +1,5 @@
using System;
#if NET35
using System;
namespace SharpCompress
{
@@ -12,4 +13,5 @@ namespace SharpCompress
return (value & flagVal) == flagVal;
}
}
}
}
#endif

1
SharpCompress/SharpCompress.Portable.csproj
View File

@@ -288,6 +288,7 @@
<Compile Include="Crypto\PBKDF2.cs" />
<Compile Include="Crypto\RijndaelEngine.cs" />
<Compile Include="Crypto\Sha1Digest.cs" />
<Compile Include="EnumExtensions.cs" />
<Compile Include="IO\CountingWritableSubStream.cs" />
<Compile Include="IO\ListeningStream.cs" />
<Compile Include="IO\MarkingBinaryReader.cs" />

3
SharpCompress/SharpCompress.PortableTest.csproj
View File

@@ -129,7 +129,7 @@
<Compile Include="Common\FilePart.cs" />
<Compile Include="Common\Entry.cs" />
<Compile Include="Common\IEntry.cs" />
<Compile Include="Common\IEntry.Extensions.cs" />
<Compile Include="Common\IEntry.Extensions.cs" />
<Compile Include="Common\IVolume.cs" />
<Compile Include="Common\Rar\RarCryptoWrapper.cs" />
<Compile Include="Common\Rar\RarRijndael.Portable.cs" />
@@ -258,6 +258,7 @@
<Compile Include="Crypto\PBKDF2.cs" />
<Compile Include="Crypto\RijndaelEngine.cs" />
<Compile Include="Crypto\Sha1Digest.cs" />
<Compile Include="EnumExtensions.cs" />
<Compile Include="IO\CountingWritableSubStream.cs" />
<Compile Include="Common\EntryStream.cs">
<SubType>Code</SubType>

3
SharpCompress/SharpCompress.Unsigned.csproj
View File

@@ -131,7 +131,7 @@
<Compile Include="Common\FilePart.cs" />
<Compile Include="Common\Entry.cs" />
<Compile Include="Common\IEntry.cs" />
<Compile Include="Common\IEntry.Extensions.cs" />
<Compile Include="Common\IEntry.Extensions.cs" />
<Compile Include="Common\IVolume.cs" />
<Compile Include="Common\Rar\RarCryptoWrapper.cs" />
<Compile Include="Common\Rar\RarRijndael.cs" />
@@ -244,6 +244,7 @@
<Compile Include="Compressor\PPMd\PpmdProperties.cs" />
<Compile Include="Compressor\PPMd\PpmdStream.cs" />
<Compile Include="Compressor\Rar\RarStream.cs" />
<Compile Include="EnumExtensions.cs" />
<Compile Include="Converter\DataConverter.cs" />
<Compile Include="IO\CountingWritableSubStream.cs" />
<Compile Include="Common\EntryStream.cs">

1
SharpCompress/SharpCompress.WindowsStore.csproj
View File

@@ -274,6 +274,7 @@
<Compile Include="Crypto\RijndaelEngine.cs" />
<Compile Include="Crypto\Pack.cs" />
<Compile Include="Crypto\Sha1Digest.cs" />
<Compile Include="EnumExtensions.cs" />
<Compile Include="IO\AppendingStream.cs" />
<Compile Include="IO\CountingWritableSubStream.cs" />
<Compile Include="IO\ListeningStream.cs" />

7
SharpCompress/SharpCompress.csproj
View File

@@ -131,7 +131,7 @@
<Compile Include="Common\FilePart.cs" />
<Compile Include="Common\Entry.cs" />
<Compile Include="Common\IEntry.cs" />
<Compile Include="Common\IEntry.Extensions.cs" />
<Compile Include="Common\IEntry.Extensions.cs" />
<Compile Include="Common\IVolume.cs" />
<Compile Include="Common\Rar\RarCryptoWrapper.cs" />
<Compile Include="Common\Rar\RarRijndael.cs" />
@@ -243,8 +243,9 @@
<Compile Include="Compressor\PPMd\I1\See2Context.cs" />
<Compile Include="Compressor\PPMd\PpmdProperties.cs" />
<Compile Include="Compressor\PPMd\PpmdStream.cs" />
<Compile Include="Compressor\Rar\RarStream.cs" />
<Compile Include="Converter\DataConverter.cs" />
<Compile Include="Compressor\Rar\RarStream.cs" />
<Compile Include="EnumExtensions.cs" />
<Compile Include="Converter\DataConverter.cs" />
<Compile Include="IO\CountingWritableSubStream.cs" />
<Compile Include="Common\EntryStream.cs">
<SubType>Code</SubType>

2
SharpCompress/Writer/IWriter.Extensions.cs
View File

@@ -35,7 +35,7 @@ namespace SharpCompress.Writer
{
throw new ArgumentException("Directory does not exist: " + directory);
}
#if NET2
#if NET35
foreach (var file in Directory.GetFiles(directory, searchPattern, option))
#else
foreach (var file in Directory.EnumerateFiles(directory, searchPattern, option))