From: danmosemsft Date: Mon, 23 Jan 2017 04:32:11 +0000 (-0800) Subject: Remove FEATURE_EXCEPTION_NOTIFICATIONS X-Git-Tag: submit/tizen/20210909.063632~11030^2~8377^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f91429d96f89964ae83879de75397f95e75bd22a;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Remove FEATURE_EXCEPTION_NOTIFICATIONS Commit migrated from https://github.com/dotnet/coreclr/commit/35bf10cf32d014dcd9d7e443c0a9b09aaef8e2b2 --- diff --git a/src/coreclr/clr.coreclr.props b/src/coreclr/clr.coreclr.props index a8b9008..90e9a6f 100644 --- a/src/coreclr/clr.coreclr.props +++ b/src/coreclr/clr.coreclr.props @@ -15,7 +15,6 @@ true true true - true true true true diff --git a/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets index 5bff02f..579d4122 100644 --- a/src/coreclr/clr.defines.targets +++ b/src/coreclr/clr.defines.targets @@ -33,7 +33,6 @@ $(CDefines);FEATURE_DBG_PUBLISH $(CDefines);FEATURE_EVENT_TRACE $(CDefines);FEATURE_EVENTSOURCE_XPLAT - $(CDefines);FEATURE_EXCEPTION_NOTIFICATIONS $(CDefines);FEATURE_FULL_NGEN $(CDefines);FEATURE_FUSION $(CDefines);FEATURE_HIJACK @@ -142,7 +141,6 @@ $(DefineConstants);FEATURE_CRYPTO $(DefineConstants);FEATURE_DISPLAY_CULTURE_INFO $(DefineConstants);FEATURE_DISPLAY_REGION_INFO - $(DefineConstants);FEATURE_EXCEPTION_NOTIFICATIONS $(DefineConstants);FEATURE_FUSION $(DefineConstants);FEATURE_HOST_ASSEMBLY_RESOLVER $(DefineConstants);FEATURE_HOSTING diff --git a/src/coreclr/clr.desktop.props b/src/coreclr/clr.desktop.props index 75a6bcc..fef8910 100644 --- a/src/coreclr/clr.desktop.props +++ b/src/coreclr/clr.desktop.props @@ -32,7 +32,6 @@ true true true - true true true true diff --git a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props index e25001f..5470c17 100644 --- a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props +++ b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props @@ -911,7 +911,7 @@ - + diff --git a/src/coreclr/src/mscorlib/src/System/AppDomain.cs b/src/coreclr/src/mscorlib/src/System/AppDomain.cs index f844c7b..c75353a 100644 --- a/src/coreclr/src/mscorlib/src/System/AppDomain.cs +++ b/src/coreclr/src/mscorlib/src/System/AppDomain.cs @@ -37,9 +37,7 @@ namespace System using System.Runtime.Versioning; using System.Diagnostics; using System.Diagnostics.Contracts; -#if FEATURE_EXCEPTION_NOTIFICATIONS using System.Runtime.ExceptionServices; -#endif // FEATURE_EXCEPTION_NOTIFICATIONS [ComVisible(true)] public class ResolveEventArgs : EventArgs @@ -279,10 +277,8 @@ namespace System // keys, the vhe values are ignored. private Dictionary _compatFlags; -#if FEATURE_EXCEPTION_NOTIFICATIONS // Delegate that will hold references to FirstChance exception notifications private EventHandler _firstChanceException; -#endif // FEATURE_EXCEPTION_NOTIFICATIONS private IntPtr _pDomain; // this is an unmanaged pointer (AppDomain * m_pDomain)` used from the VM. @@ -1066,7 +1062,6 @@ namespace System } } -#if FEATURE_EXCEPTION_NOTIFICATIONS // This is the event managed code can wireup against to be notified // about first chance exceptions. // @@ -1088,7 +1083,6 @@ namespace System _firstChanceException -= value; } } -#endif // FEATURE_EXCEPTION_NOTIFICATIONS private void OnAssemblyLoadEvent(RuntimeAssembly LoadedAssembly) { diff --git a/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs b/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs index b084891..ca316ff 100644 --- a/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs +++ b/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs @@ -13,7 +13,6 @@ ** gkhanna ** =============================================================================*/ -#if FEATURE_EXCEPTION_NOTIFICATIONS namespace System.Runtime.ExceptionServices { using System; using System.Runtime.ConstrainedExecution; @@ -38,4 +37,3 @@ namespace System.Runtime.ExceptionServices { private Exception m_Exception; } } -#endif // FEATURE_EXCEPTION_NOTIFICATIONS \ No newline at end of file