diff options
| author | Marek Safar <marek.safar@gmail.com> | 2018-03-20 12:02:33 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-04-12 12:39:27 +0300 |
| commit | b3881a418f1391a33c1b709f1113574b74ae85ae (patch) | |
| tree | 3cb92092d641ccc9caec9dd79ffb80dc8e1236cc /mcs/class/System.IO.Compression.FileSystem | |
| parent | 0248399b2a23aa5cacd95fad5d5902138b22d198 (diff) | |
CoreFX update
Diffstat (limited to 'mcs/class/System.IO.Compression.FileSystem')
3 files changed, 3 insertions, 11 deletions
diff --git a/mcs/class/System.IO.Compression.FileSystem/Makefile b/mcs/class/System.IO.Compression.FileSystem/Makefile index 6c5cb1f6ed0..c66c602fd91 100644 --- a/mcs/class/System.IO.Compression.FileSystem/Makefile +++ b/mcs/class/System.IO.Compression.FileSystem/Makefile @@ -5,13 +5,12 @@ include ../../build/rules.make LIBRARY = System.IO.Compression.FileSystem.dll LIB_REFS = System System.IO.Compression KEYFILE = ../ecma.pub -LIB_MCS_FLAGS = -unsafe +LIB_MCS_FLAGS = -unsafe -nowarn:436 TEST_MCS_FLAGS = TEST_LIB_REFS = System System.Core System.IO.Compression LIBRARY_WARN_AS_ERROR = yes RESX_RESOURCE_STRING = \ - ../../../external/corefx/src/System.IO.Compression.FileSystem/src/Resources/Strings.resx \ - ../../../external/corefx/src/System.Buffers/src/Resources/Strings.resx + ../../../external/corefx/src/System.IO.Compression.ZipFile/src/Resources/Strings.resx include ../../build/library.make diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources index 30a80ab5f2f..e5ff8185251 100644 --- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources +++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources @@ -1,14 +1,8 @@ AssemblyInfo.cs -../../build/common/Consts.cs +#../../build/common/Consts.cs corefx/SR.cs ../../../external/corefx/src/Common/src/System/IO/PathInternal.CaseSensitivity.cs ../../../external/corefx/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFile.cs ../../../external/corefx/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.cs - -../../../external/corefx/src/System.Buffers/src/System/Buffers/ArrayPool.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/ArrayPoolEventSource.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/DefaultArrayPool.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/DefaultArrayPoolBucket.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/Utilities.cs diff --git a/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs b/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs index 0a253cb8916..e188b2ef024 100644 --- a/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs +++ b/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs @@ -6,5 +6,4 @@ partial class SR { public const string IO_DirectoryNameWithData = "Zip entry name ends in directory separator character but contains data."; public const string IO_ExtractingResultsInOutside = "Extracting Zip entry would have resulted in a file outside the specified destination directory."; - public const string ArgumentException_BufferNotFromPool = "The buffer is not associated with this pool and may not be returned to it."; } |