From 35bf10cf32d014dcd9d7e443c0a9b09aaef8e2b2 Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Sun, 22 Jan 2017 20:32:11 -0800
Subject: [PATCH] Remove FEATURE_EXCEPTION_NOTIFICATIONS

---
 clr.coreclr.props                                                   | 1 -
 clr.defines.targets                                                 | 2 --
 clr.desktop.props                                                   | 1 -
 src/mscorlib/mscorlib.shared.sources.props                          | 2 +-
 src/mscorlib/src/System/AppDomain.cs                                | 6 ------
 .../src/System/Runtime/ExceptionServices/ExceptionNotification.cs   | 2 --
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/clr.coreclr.props b/clr.coreclr.props
index a8b9008..90e9a6f 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -15,7 +15,6 @@
     <FeatureDbiOopDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostOneCorex86>
     <FeatureDbiOopDebugging_HostOneCoreamd64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureDbiOopDebugging_HostOneCoreamd64>
     <FeatureEventTrace>true</FeatureEventTrace>
-    <FeatureExceptionNotifications>true</FeatureExceptionNotifications>
     <FeatureFrameworkInternal>true</FeatureFrameworkInternal>
     <FeatureHijack>true</FeatureHijack>
     <FeatureInteropDebugging Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureInteropDebugging>
diff --git a/clr.defines.targets b/clr.defines.targets
index 5bff02f..579d412 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -33,7 +33,6 @@
         <CDefines Condition="'$(FeatureDbgPublish)' == 'true'">$(CDefines);FEATURE_DBG_PUBLISH</CDefines>
         <CDefines Condition="'$(FeatureEventTrace)' == 'true'">$(CDefines);FEATURE_EVENT_TRACE</CDefines>
         <CDefines Condition="'$(FeatureXplatEventSource)' == 'true'">$(CDefines);FEATURE_EVENTSOURCE_XPLAT</CDefines>
-        <CDefines Condition="'$(FeatureExceptionNotifications)' == 'true'">$(CDefines);FEATURE_EXCEPTION_NOTIFICATIONS</CDefines>
         <CDefines Condition="'$(FeatureFullNGen)' == 'true'">$(CDefines);FEATURE_FULL_NGEN</CDefines>
         <CDefines Condition="'$(FeatureFusion)' == 'true'">$(CDefines);FEATURE_FUSION</CDefines>
         <CDefines Condition="'$(FeatureHijack)' == 'true'">$(CDefines);FEATURE_HIJACK</CDefines>
@@ -142,7 +141,6 @@
         <DefineConstants Condition="'$(FeatureCrypto)' == 'true'">$(DefineConstants);FEATURE_CRYPTO</DefineConstants>
         <DefineConstants Condition="'$(FeatureDisplayCultureInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_CULTURE_INFO</DefineConstants>
         <DefineConstants Condition="'$(FeatureDisplayRegionInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_REGION_INFO</DefineConstants>
-        <DefineConstants Condition="'$(FeatureExceptionNotifications)' == 'true'">$(DefineConstants);FEATURE_EXCEPTION_NOTIFICATIONS</DefineConstants>
         <DefineConstants Condition="'$(FeatureFusion)' == 'true'">$(DefineConstants);FEATURE_FUSION</DefineConstants>
         <DefineConstants Condition="'$(FeatureHostAssemblyResolver)' == 'true'">$(DefineConstants);FEATURE_HOST_ASSEMBLY_RESOLVER</DefineConstants>
         <DefineConstants Condition="'$(FeatureHosting)' == 'true'">$(DefineConstants);FEATURE_HOSTING</DefineConstants>
diff --git a/clr.desktop.props b/clr.desktop.props
index 75a6bcc..fef8910 100644
--- a/clr.desktop.props
+++ b/clr.desktop.props
@@ -32,7 +32,6 @@
     <FeatureDisplayCultureInfo>true</FeatureDisplayCultureInfo>
     <FeatureDisplayRegionInfo>true</FeatureDisplayRegionInfo>
     <FeatureEventTrace>true</FeatureEventTrace>
-    <FeatureExceptionNotifications>true</FeatureExceptionNotifications>
     <FeatureFullNGen>true</FeatureFullNGen>
     <FeatureFusion>true</FeatureFusion>
     <FeatureHijack>true</FeatureHijack>
diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props
index e25001f..5470c17 100644
--- a/src/mscorlib/mscorlib.shared.sources.props
+++ b/src/mscorlib/mscorlib.shared.sources.props
@@ -911,7 +911,7 @@
   <ItemGroup>
     <ExceptionservicesSources Include="$(BclSourcesRoot)\System\Runtime\ExceptionServices\CorruptingExceptionCommon.cs" />
     <ExceptionservicesSources Include="$(BclSourcesRoot)\System\Runtime\ExceptionServices\ExceptionServicesCommon.cs" />
-    <ExceptionservicesSources Condition="'$(FeatureExceptionNotifications)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\ExceptionServices\ExceptionNotification.cs" />
+    <ExceptionservicesSources Include="$(BclSourcesRoot)\System\Runtime\ExceptionServices\ExceptionNotification.cs" />
   </ItemGroup>
   <ItemGroup>
     <HostingSources Condition="'$(FeatureHostAssemblyResolver)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\Loader\AssemblyLoadContext.cs" />
diff --git a/src/mscorlib/src/System/AppDomain.cs b/src/mscorlib/src/System/AppDomain.cs
index f844c7b..c75353a 100644
--- a/src/mscorlib/src/System/AppDomain.cs
+++ b/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<String, object>  _compatFlags;
 
-#if FEATURE_EXCEPTION_NOTIFICATIONS
         // Delegate that will hold references to FirstChance exception notifications
         private EventHandler<FirstChanceExceptionEventArgs> _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/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs b/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs
index b084891..ca316ff 100644
--- a/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs
+++ b/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionNotification.cs
@@ -13,7 +13,6 @@
 ** <owner>gkhanna</owner>
 ** 
 =============================================================================*/
-#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
-- 
2.7.4