From 97ad68721b536f2802ac589d8fe55fb20ae7538e Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 8 Apr 2015 17:34:52 +0200 Subject: [PATCH] [corlib] More System types from reference sources --- mcs/class/corlib/System/ApplicationId.cs | 138 ------------------ mcs/class/corlib/System/ContextBoundObject.cs | 44 ------ .../corlib/System/InvalidTimeZoneException.cs | 52 ------- .../System/TimeZoneNotFoundException.cs | 53 ------- mcs/class/corlib/corlib.dll.sources | 10 +- 5 files changed, 6 insertions(+), 291 deletions(-) delete mode 100644 mcs/class/corlib/System/ApplicationId.cs delete mode 100644 mcs/class/corlib/System/ContextBoundObject.cs delete mode 100644 mcs/class/corlib/System/InvalidTimeZoneException.cs delete mode 100644 mcs/class/corlib/System/TimeZoneNotFoundException.cs diff --git a/mcs/class/corlib/System/ApplicationId.cs b/mcs/class/corlib/System/ApplicationId.cs deleted file mode 100644 index b8675911fc3..00000000000 --- a/mcs/class/corlib/System/ApplicationId.cs +++ /dev/null @@ -1,138 +0,0 @@ -// -// System.ApplicationId class -// -// Author: -// Sebastien Pouliot -// -// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.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.Runtime.InteropServices; -using System.Text; - -namespace System { - - [Serializable] - [ComVisible (true)] - public sealed class ApplicationId { - - private byte[] _token; - private string _name; - private Version _version; - private string _proc; - private string _culture; - - public ApplicationId (byte[] publicKeyToken, string name, Version version, string processorArchitecture, string culture) - { - if (publicKeyToken == null) - throw new ArgumentNullException ("publicKeyToken"); - if (name == null) - throw new ArgumentNullException ("name"); - if (version == null) - throw new ArgumentNullException ("version"); - - _token = (byte[]) publicKeyToken.Clone (); - _name = name; - _version = version; - _proc = processorArchitecture; - _culture = culture; - } - - // properties - - public string Culture { - get { return _culture; } - } - - public string Name { - get { return _name; } - } - - public string ProcessorArchitecture { - get { return _proc; } - } - - public byte[] PublicKeyToken { - get { return (byte[]) _token.Clone (); } - } - - public Version Version { - get { return _version; } - } - - // methods - - public ApplicationId Copy () - { - return new ApplicationId (_token, _name, _version, _proc, _culture); - } - - public override bool Equals (object o) - { - if (o == null) - return false; - ApplicationId appid = (o as ApplicationId); - if (appid == null) - return false; - if (_name != appid._name) - return false; - if (_proc != appid._proc) - return false; - if (_culture != appid._culture) - return false; - if (!_version.Equals (appid._version)) - return false; - if (_token.Length != appid._token.Length) - return false; - for (int i=0; i < _token.Length; i++) - if (_token [i] != appid._token [i]) - return false; - return true; - } - - public override int GetHashCode () - { - int code = _name.GetHashCode () ^ _version.GetHashCode (); - for (int i=0; i < _token.Length; i++) - code ^= _token [i]; - // ProcessorArchitecture and Culture aren't part of the hash code - // Confirmed by Microsoft in FDBK13339 - return code; - } - - public override string ToString () - { - StringBuilder sb = new StringBuilder (); - sb.Append (_name); - if (_culture != null) - sb.AppendFormat (", culture=\"{0}\"", _culture); - sb.AppendFormat (", version=\"{0}\", publicKeyToken=\"", _version); - for (int i=0; i < _token.Length; i++) - sb.Append (_token [i].ToString ("X2")); - if (_proc != null) - sb.AppendFormat ("\", processorArchitecture =\"{0}\"", _proc); - else - sb.Append ("\""); - return sb.ToString (); - } - } -} diff --git a/mcs/class/corlib/System/ContextBoundObject.cs b/mcs/class/corlib/System/ContextBoundObject.cs deleted file mode 100644 index ca954d6d758..00000000000 --- a/mcs/class/corlib/System/ContextBoundObject.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -// System.ContextBoundObject.cs -// -// Author: -// Miguel de Icaza (miguel@ximian.com) -// -// (C) Ximian, Inc. http://www.ximian.com -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.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.Runtime.InteropServices; - -namespace System -{ - [Serializable] - [ComVisible (true)] - public abstract class ContextBoundObject : MarshalByRefObject - { - protected ContextBoundObject () - { - } - } -} diff --git a/mcs/class/corlib/System/InvalidTimeZoneException.cs b/mcs/class/corlib/System/InvalidTimeZoneException.cs deleted file mode 100644 index 27dd66a92a5..00000000000 --- a/mcs/class/corlib/System/InvalidTimeZoneException.cs +++ /dev/null @@ -1,52 +0,0 @@ -/* - * System.InvalidimeZoneException - * - * Author(s) - * Stephane Delcroix - * - * 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.Runtime.CompilerServices; - -namespace System -{ - [Serializable] -#if MOBILE - [TypeForwardedFrom (Consts.AssemblySystem_Core)] -#else - [TypeForwardedFrom (Consts.AssemblySystemCore_3_5)] -#endif - public - class InvalidTimeZoneException : Exception - { - public InvalidTimeZoneException () : base () - {} - - public InvalidTimeZoneException (string message) : base (message) - {} - - public InvalidTimeZoneException (string message, Exception innerException) : base (message, innerException) - {} - - protected InvalidTimeZoneException (Runtime.Serialization.SerializationInfo info, Runtime.Serialization.StreamingContext context) : base (info, context) - {} - } -} diff --git a/mcs/class/corlib/System/TimeZoneNotFoundException.cs b/mcs/class/corlib/System/TimeZoneNotFoundException.cs deleted file mode 100644 index 1333d971c82..00000000000 --- a/mcs/class/corlib/System/TimeZoneNotFoundException.cs +++ /dev/null @@ -1,53 +0,0 @@ -/* - * System.TimeZoneNotFoundException - * - * Author(s) - * Stephane Delcroix - * - * 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.Runtime.CompilerServices; - -namespace System -{ - [Serializable] -#if MOBILE - [TypeForwardedFrom (Consts.AssemblySystem_Core)] -#else - [TypeForwardedFrom (Consts.AssemblySystemCore_3_5)] -#endif - public - class TimeZoneNotFoundException : Exception - { - public TimeZoneNotFoundException () : base () - {} - - public TimeZoneNotFoundException (string message) : base (message) - {} - - public TimeZoneNotFoundException (string message, Exception innerException) : base (message, innerException) - {} - - protected TimeZoneNotFoundException (Runtime.Serialization.SerializationInfo info, Runtime.Serialization.StreamingContext context) : base (info, context) - {} - } -} diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 78c3d99ddcc..dfc262d7ecc 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -88,7 +88,6 @@ System/AppDomain.cs System/AppDomainInitializer.cs System/AppDomainManager.cs System/AppDomainSetup.cs -System/ApplicationId.cs System/ApplicationIdentity.cs System/ArgIterator.cs System/Array.cs @@ -100,7 +99,6 @@ System/CStreamWriter.cs System/Console.cs System/Console.iOS.cs System/ConsoleDriver.cs -System/ContextBoundObject.cs System/ControlCharacters.cs System/CrossAppDomainDelegate.cs System/Delegate.cs @@ -118,7 +116,6 @@ System/Guid.cs System/Guid.MonoTouch.cs System/IConsoleDriver.cs System/IntPtr.cs -System/InvalidTimeZoneException.cs System/KnownTerminals.cs System/LocalDataStoreSlot.cs System/MarshalByRefObject.cs @@ -157,7 +154,6 @@ System/TimeZoneInfo.Android.cs System/TimeZoneInfo.MonoTouch.cs System/TimeZoneInfo.Serialization.cs System/TimeZoneInfo.TransitionTime.cs -System/TimeZoneNotFoundException.cs ../../build/common/MonoTODOAttribute.cs System/TypeSpec.cs System/TypeCode.cs @@ -1147,6 +1143,7 @@ ReferenceSources/CompareInfo.cs ../../../external/referencesource/mscorlib/system/appdomainattributes.cs ../../../external/referencesource/mscorlib/system/appdomainunloadedexception.cs ../../../external/referencesource/mscorlib/system/applicationexception.cs +../../../external/referencesource/mscorlib/system/applicationid.cs ../../../external/referencesource/mscorlib/system/argumentexception.cs ../../../external/referencesource/mscorlib/system/argumentnullexception.cs ../../../external/referencesource/mscorlib/system/argumentoutofrangeexception.cs @@ -1170,6 +1167,7 @@ ReferenceSources/CompareInfo.cs ../../../external/referencesource/mscorlib/system/consolekeyinfo.cs ../../../external/referencesource/mscorlib/system/consolemodifiers.cs ../../../external/referencesource/mscorlib/system/consolespecialkey.cs +../../../external/referencesource/mscorlib/system/contextboundobject.cs ../../../external/referencesource/mscorlib/system/contextstaticattribute.cs ../../../external/referencesource/mscorlib/system/clscompliantattribute.cs ../../../external/referencesource/mscorlib/system/contextmarshalexception.cs @@ -1219,6 +1217,7 @@ ReferenceSources/CompareInfo.cs ../../../external/referencesource/mscorlib/system/iobserver.cs ../../../external/referencesource/mscorlib/system/iprogress.cs ../../../external/referencesource/mscorlib/system/iserviceobjectprovider.cs +../../../external/referencesource/mscorlib/system/invalidtimezoneexception.cs ../../../external/referencesource/mscorlib/system/Lazy.cs ../../../external/referencesource/mscorlib/system/memberaccessexception.cs ../../../external/referencesource/mscorlib/system/methodaccessexception.cs @@ -1257,6 +1256,7 @@ ReferenceSources/CompareInfo.cs ../../../external/referencesource/mscorlib/system/threadattributes.cs ../../../external/referencesource/mscorlib/system/threadstaticattribute.cs ../../../external/referencesource/mscorlib/system/throwhelper.cs +../../../external/referencesource/mscorlib/system/timezonenotfoundexception.cs ../../../external/referencesource/mscorlib/system/tuple.cs ../../../external/referencesource/mscorlib/system/type.cs ../../../external/referencesource/mscorlib/system/typeaccessexception.cs @@ -1536,6 +1536,8 @@ ReferenceSources/CompareInfo.cs ../../../external/referencesource/mscorlib/system/runtime/compilerservices/unsafevaluetypeattribute.cs ../../../external/referencesource/mscorlib/system/runtime/compilerservices/YieldAwaitable.cs +../../../external/referencesource/mscorlib/system/security/util/hex.cs + ../../../external/referencesource/mscorlib/system/text/asciiencoding.cs ../../../external/referencesource/mscorlib/system/text/codepageencoding.cs ../../../external/referencesource/mscorlib/system/text/decoderbestfitfallback.cs -- 2.25.1