diff options
author | Marek Safar <marek.safar@gmail.com> | 2016-07-27 10:40:11 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2016-07-27 10:59:24 +0300 |
commit | 91493edd377bddf2355ac991597a5473645158f6 (patch) | |
tree | 1a6c4c46ba2a7f2213cfd63944d568e017010809 | |
parent | 43c7daff3987c89dae36bae21ab88779cfdb0340 (diff) |
[Facades] Remove duplicate System.IO.Compression
6 files changed, 1 insertions, 136 deletions
diff --git a/mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs b/mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs deleted file mode 100644 index 08e157f660d..00000000000 --- a/mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -using System; -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle ("System.IO.Compression.dll")] -[assembly: AssemblyDescription ("System.IO.Compression.dll")] -[assembly: AssemblyDefaultAlias ("System.IO.Compression.dll")] -[assembly: AssemblyCompany ("Xamarin, Inc.")] -[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] -[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] -[assembly: AssemblyInformationalVersion ("4.0.0.0")] -[assembly: AssemblyFileVersion ("4.0.0.0")] -[assembly: AssemblyDelaySign (true)] -[assembly: AssemblyKeyFile ("../../msfinal.pub")] - -[assembly: ReferenceAssembly] - - diff --git a/mcs/class/Facades/System.IO.Compression/Makefile b/mcs/class/Facades/System.IO.Compression/Makefile deleted file mode 100644 index 4fbfc5625b5..00000000000 --- a/mcs/class/Facades/System.IO.Compression/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -MCS_BUILD_DIR = ../../../build - -thisdir = class/Facades/System.IO.Compression -SUBDIRS = -include $(MCS_BUILD_DIR)/rules.make - -LIBRARY_SUBDIR = Facades -LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades - -LIBRARY = System.IO.Compression.dll - -KEY_FILE = ../../msfinal.pub -SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 -LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) - -PLATFORM_DEBUG_FLAGS = - -NO_TEST = yes - -include $(MCS_BUILD_DIR)/library.make - - diff --git a/mcs/class/Facades/System.IO.Compression/Missing.cs b/mcs/class/Facades/System.IO.Compression/Missing.cs deleted file mode 100644 index cd06b1c6842..00000000000 --- a/mcs/class/Facades/System.IO.Compression/Missing.cs +++ /dev/null @@ -1,40 +0,0 @@ -// This is stub only. The implementation should come from https://github.com/dotnet/corefx/tree/master/src/System.IO.Compression/src/System/IO/Compression - -namespace System.IO.Compression -{ - public class ZipArchive : System.IDisposable - { - public ZipArchive(System.IO.Stream stream) { } - public ZipArchive(System.IO.Stream stream, System.IO.Compression.ZipArchiveMode mode) { } - public ZipArchive(System.IO.Stream stream, System.IO.Compression.ZipArchiveMode mode, bool leaveOpen) { } - public ZipArchive(System.IO.Stream stream, System.IO.Compression.ZipArchiveMode mode, bool leaveOpen, System.Text.Encoding entryNameEncoding) { } - public System.Collections.ObjectModel.ReadOnlyCollection<System.IO.Compression.ZipArchiveEntry> Entries { get { return default(System.Collections.ObjectModel.ReadOnlyCollection<System.IO.Compression.ZipArchiveEntry>); } } - public System.IO.Compression.ZipArchiveMode Mode { get { return default(System.IO.Compression.ZipArchiveMode); } } - public System.IO.Compression.ZipArchiveEntry CreateEntry(string entryName) { return default(System.IO.Compression.ZipArchiveEntry); } - public System.IO.Compression.ZipArchiveEntry CreateEntry(string entryName, System.IO.Compression.CompressionLevel compressionLevel) { return default(System.IO.Compression.ZipArchiveEntry); } - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - public System.IO.Compression.ZipArchiveEntry GetEntry(string entryName) { return default(System.IO.Compression.ZipArchiveEntry); } - } - - public partial class ZipArchiveEntry - { - internal ZipArchiveEntry() { } - public System.IO.Compression.ZipArchive Archive { get { return default(System.IO.Compression.ZipArchive); } } - public long CompressedLength { get { return default(long); } } - public string FullName { get { return default(string); } } - public System.DateTimeOffset LastWriteTime { get { return default(System.DateTimeOffset); } set { } } - public long Length { get { return default(long); } } - public string Name { get { return default(string); } } - public void Delete() { } - public System.IO.Stream Open() { return default(System.IO.Stream); } - public override string ToString() { return default(string); } - } - - public enum ZipArchiveMode - { - Create = 1, - Read = 0, - Update = 2, - } -}
\ No newline at end of file diff --git a/mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources b/mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources deleted file mode 100644 index 402d066e4c3..00000000000 --- a/mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources +++ /dev/null @@ -1,3 +0,0 @@ -TypeForwarders.cs -AssemblyInfo.cs -Missing.cs diff --git a/mcs/class/Facades/System.IO.Compression/TypeForwarders.cs b/mcs/class/Facades/System.IO.Compression/TypeForwarders.cs deleted file mode 100644 index 5eaf037320b..00000000000 --- a/mcs/class/Facades/System.IO.Compression/TypeForwarders.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.CompressionLevel))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.CompressionMode))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.DeflateStream))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.GZipStream))] - - diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index e1f56af6a29..244a64dbf5e 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -25,7 +25,7 @@ System.Security.Cryptography.Hashing.Algorithms System.Security.Cryptography.RSA System.Security.Principal.Windows System.Threading.Thread System.Threading.ThreadPool \ System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl System.Diagnostics.StackTrace System.Globalization.Extensions \ System.IO.FileSystem.AccessControl System.Private.CoreLib.InteropServices System.Private.CoreLib.Threading System.Reflection.TypeExtensions \ -System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.Xml.XPath.XDocument System.IO.Compression \ +System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.Xml.XPath.XDocument \ System.Security.Cryptography.Algorithms System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes |