diff options
author | Anipik <anirudhagnihotry098@gmail.com> | 2018-08-09 06:21:37 +0300 |
---|---|---|
committer | Anirudh Agnihotry <anirudhagnihotry098@gmail.com> | 2018-08-09 07:05:03 +0300 |
commit | 677a6ed3cde826486dc21e3929794c851176f4b2 (patch) | |
tree | c987c0b3cd65ccbcee775418b231fe77a013d919 /src | |
parent | 7902bed42a15edd4e6d385ed57ef27d43a63a640 (diff) |
Non shared changes
Diffstat (limited to 'src')
4 files changed, 3 insertions, 55 deletions
diff --git a/src/System.Private.CoreLib/src/Resources/Strings.resx b/src/System.Private.CoreLib/src/Resources/Strings.resx index 1cfdaaa76..08068dbe3 100644 --- a/src/System.Private.CoreLib/src/Resources/Strings.resx +++ b/src/System.Private.CoreLib/src/Resources/Strings.resx @@ -192,6 +192,9 @@ <data name="Arg_DuplicateWaitObjectException" xml:space="preserve"> <value>Duplicate objects in argument.</value> </data> + <data name="Arg_EHClauseNotFilter" xml:space="preserve"> + <value>This ExceptionHandlingClause is not a filter.</value> + </data> <data name="Arg_EnumAndObjectMustBeSameType" xml:space="preserve"> <value>Object must be the same type as the enum. The type passed in was '{0}'; the enum type was '{1}'.</value> </data> diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj index e3c78823e..d978b8ddd 100644 --- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj @@ -179,11 +179,9 @@ <Compile Include="System\Reflection\Emit\ReflectionEmitThrower.cs" /> <Compile Include="System\Reflection\Emit\SignatureHelper.cs" /> <Compile Include="System\Reflection\Emit\TypeBuilder.cs" /> - <Compile Include="System\Reflection\ExceptionHandlingClause.cs" /> <Compile Include="System\Reflection\FieldInfo.CoreRT.cs" /> <Compile Include="System\Reflection\LegacyCustomAttributeApis.cs" /> <Compile Include="System\Reflection\MethodBase.CoreRT.cs" /> - <Compile Include="System\Reflection\MethodBody.cs" /> <Compile Include="System\Reflection\Runtime\CustomAttributes\RuntimeImplementedCustomAttributeData.cs" /> <Compile Include="System\Resources\FileBasedResourceGroveler.cs" /> <Compile Include="System\Resources\IResourceGroveler.cs" /> diff --git a/src/System.Private.CoreLib/src/System/Reflection/ExceptionHandlingClause.cs b/src/System.Private.CoreLib/src/System/Reflection/ExceptionHandlingClause.cs deleted file mode 100644 index 8598256b3..000000000 --- a/src/System.Private.CoreLib/src/System/Reflection/ExceptionHandlingClause.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Globalization; - -namespace System.Reflection -{ - public class ExceptionHandlingClause - { - protected ExceptionHandlingClause() { } - - // Desktop compat: These default implementations behave strangely because this class was originally - // creatable only from the native runtime, not through subclass inheritance. - - public virtual Type CatchType => null; - public virtual int FilterOffset { get { throw new InvalidOperationException(); } } - public virtual ExceptionHandlingClauseOptions Flags => default(ExceptionHandlingClauseOptions); - public virtual int HandlerLength => 0; - public virtual int HandlerOffset => 0; - public virtual int TryLength => 0; - public virtual int TryOffset => 0; - - public override string ToString() - { - return string.Format(CultureInfo.CurrentUICulture, - "Flags={0}, TryOffset={1}, TryLength={2}, HandlerOffset={3}, HandlerLength={4}, CatchType={5}", - Flags, TryOffset, TryLength, HandlerOffset, HandlerLength, CatchType); - } - } -} diff --git a/src/System.Private.CoreLib/src/System/Reflection/MethodBody.cs b/src/System.Private.CoreLib/src/System/Reflection/MethodBody.cs deleted file mode 100644 index b87558573..000000000 --- a/src/System.Private.CoreLib/src/System/Reflection/MethodBody.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; - -namespace System.Reflection -{ - public class MethodBody - { - protected MethodBody() { } - - // Desktop compat: These default implementations behave strangely because this class was originally - // creatable only from the native runtime, not through subclass inheritance. - public virtual int LocalSignatureMetadataToken => 0; - public virtual IList<LocalVariableInfo> LocalVariables { get { throw new ArgumentNullException("array"); } } - public virtual int MaxStackSize => 0; - public virtual bool InitLocals => false; - public virtual byte[] GetILAsByteArray() => null; - public virtual IList<ExceptionHandlingClause> ExceptionHandlingClauses { get { throw new ArgumentNullException("array"); } } - } -} |