Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@ -106,8 +106,8 @@ namespace System.IO.Compression
zipFile = mode == ZipArchiveMode.Create ?
SharpCompress.Archive.Zip.ZipArchive.Create() :
SharpCompress.Archive.Zip.ZipArchive.Open(stream);
} catch (Exception) {
throw new InvalidDataException("The contents of the stream are not in the zip archive format.");
} catch (Exception e) {
throw new InvalidDataException("The contents of the stream are not in the zip archive format.", e);
}
entries = new Dictionary<string, ZipArchiveEntry>();
@ -202,7 +202,7 @@ namespace System.IO.Compression
private void Save()
{
using (var newZip = new MemoryStream()) {
zipFile.SaveTo(newZip, CompressionType.Deflate);
zipFile.SaveTo(newZip, CompressionType.Deflate, entryNameEncoding ?? Encoding.UTF8);
stream.SetLength(0);
stream.Position = 0;