From 7c09a59ee32b7246ca2fe15212603527c973532e Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 4 Jan 2017 13:01:09 +0100 Subject: [PATCH] [System] Compression enums from corefx --- .../System.IO.Compression/CompressionLevel.cs | 33 ---------------------- .../System.IO.Compression/CompressionMode.cs | 17 ----------- mcs/class/System/common.sources | 5 ++-- 3 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 mcs/class/System/System.IO.Compression/CompressionLevel.cs delete mode 100644 mcs/class/System/System.IO.Compression/CompressionMode.cs diff --git a/mcs/class/System/System.IO.Compression/CompressionLevel.cs b/mcs/class/System/System.IO.Compression/CompressionLevel.cs deleted file mode 100644 index 902aca6e80b..00000000000 --- a/mcs/class/System/System.IO.Compression/CompressionLevel.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -// Authors: -// Martin Baulig (martin.baulig@xamarin.com) -// -// Copyright 2012 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. -// -namespace System.IO.Compression { - public enum CompressionLevel { - Optimal, - Fastest, - NoCompression - } -} diff --git a/mcs/class/System/System.IO.Compression/CompressionMode.cs b/mcs/class/System/System.IO.Compression/CompressionMode.cs deleted file mode 100644 index 60adaa81f54..00000000000 --- a/mcs/class/System/System.IO.Compression/CompressionMode.cs +++ /dev/null @@ -1,17 +0,0 @@ -/* -*- Mode: csharp; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -// -// CompressionMOode.cs -// -// Authors: -// Christopher James Lahey -// -// (c) 2004 Novell, Inc. (http://www.novell.com) -// - -namespace System.IO.Compression { - public enum CompressionMode { - Decompress=0, // Decompress the given stream. - Compress=1 // Compress the given stream. - }; -} - diff --git a/mcs/class/System/common.sources b/mcs/class/System/common.sources index a6bef85dedd..9d753f14432 100644 --- a/mcs/class/System/common.sources +++ b/mcs/class/System/common.sources @@ -25,8 +25,6 @@ System.Diagnostics/ThreadState.cs System.Diagnostics/ThreadWaitReason.cs System.Diagnostics/TraceImpl.cs -System.IO.Compression/CompressionLevel.cs -System.IO.Compression/CompressionMode.cs System.IO.Compression/DeflateStream.cs System.IO.Compression/GZipStream.cs @@ -926,3 +924,6 @@ ReferenceSources/Win32Exception.cs ../referencesource/System/compmod/system/codedom/compiler/IndentTextWriter.cs ../referencesource/System/compmod/microsoft/win32/safehandles/SafeProcessHandle.cs + +../../../external/corefx/src/System.IO.Compression/src/System/IO/Compression/CompressionLevel.cs +../../../external/corefx/src/System.IO.Compression/src/System/IO/Compression/CompressionMode.cs -- 2.11.4.GIT