From 4a0a5473c5e146891eb02d65afcddb060363ff4b Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Sun, 22 Jan 2017 20:48:38 -0800
Subject: [PATCH] FEATURE_SYNCHRONIZATIONCONTEXT_WAIT

---
 clr.coreclr.props                                           |  1 -
 clr.defines.targets                                         |  3 ---
 clr.desktop.props                                           |  1 -
 src/mscorlib/src/System/Threading/SynchronizationContext.cs | 10 ----------
 4 files changed, 15 deletions(-)

diff --git a/clr.coreclr.props b/clr.coreclr.props
index 89dce77..d48ce23 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -39,7 +39,6 @@
     <FeatureUseAsmGCWriteBarriers>true</FeatureUseAsmGCWriteBarriers>
     <!-- Setting this to "false" works only for workstation GC, not server. -->
     <FeatureSymDiff>true</FeatureSymDiff>
-    <FeatureSynchronizationContextWait>true</FeatureSynchronizationContextWait>
     <FeatureReadyToRun Condition="'$(TargetArch)'!='arm64'">true</FeatureReadyToRun>
     <FeatureClassicCominterop>true</FeatureClassicCominterop>
     <FeatureCominterop>true</FeatureCominterop>
diff --git a/clr.defines.targets b/clr.defines.targets
index 01493d7..58256c2 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -84,9 +84,7 @@
         <CDefines Condition="'$(FeatureStandaloneSn)' == 'true'">$(CDefines);FEATURE_STANDALONE_SN</CDefines>
         <CDefines Condition="'$(FeatureStrongnameDelaySigningAllowed)' == 'true'">$(CDefines);FEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED</CDefines>
         <CDefines Condition="'$(FeatureSvrGc)' == 'true'">$(CDefines);FEATURE_SVR_GC</CDefines>
-        <CDefines Condition="'$(FeatureSynchronizationContextWait)' == 'true'">$(CDefines);FEATURE_SYNCHRONIZATIONCONTEXT_WAIT</CDefines>
         <CDefines Condition="'$(FeaturePerfMap)' == 'true'">$(CDefines);FEATURE_PERFMAP</CDefines>
-        <CDefines Condition="'$(FeatureSynchronizationcontextWait)' == 'true'">$(CDefines);FEATURE_SYNCHRONIZATIONCONTEXT_WAIT</CDefines>
         <CDefines Condition="'$(FeatureSyntheticCultures)' == 'true'">$(CDefines);FEATURE_SYNTHETIC_CULTURES</CDefines>
         <CDefines Condition="'$(FeatureTypeEquivalence)' == 'true'">$(CDefines);FEATURE_TYPEEQUIVALENCE</CDefines>
         <CDefines Condition="'$(FeatureUefChainmanager)' == 'true'">$(CDefines);FEATURE_UEF_CHAINMANAGER</CDefines>
@@ -161,7 +159,6 @@
         <DefineConstants Condition="'$(FeatureRwlock)' == 'true'">$(DefineConstants);FEATURE_RWLOCK</DefineConstants>
         <DefineConstants Condition="'$(FeatureSerialization)' == 'true'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureSortTables)' == 'true'">$(DefineConstants);FEATURE_SORT_TABLES</DefineConstants>
-        <DefineConstants Condition="'$(FeatureSynchronizationcontextWait)' == 'true'">$(DefineConstants);FEATURE_SYNCHRONIZATIONCONTEXT_WAIT</DefineConstants>
         <DefineConstants Condition="'$(FeatureSyntheticCultures)' == 'true'">$(DefineConstants);FEATURE_SYNTHETIC_CULTURES</DefineConstants>
         <DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
         <DefineConstants Condition="'$(FeatureUseLcid)' == 'true'">$(DefineConstants);FEATURE_USE_LCID</DefineConstants>
diff --git a/clr.desktop.props b/clr.desktop.props
index e10f048..d3768a8 100644
--- a/clr.desktop.props
+++ b/clr.desktop.props
@@ -70,7 +70,6 @@
     <FeatureStackProbe Condition="'$(TargetArch)' != 'arm'">true</FeatureStackProbe>
     <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
     <FeatureSvrGc>true</FeatureSvrGc>
-    <FeatureSynchronizationcontextWait>true</FeatureSynchronizationcontextWait>
     <FeatureSyntheticCultures>true</FeatureSyntheticCultures>
     <FeatureTypeEquivalence>true</FeatureTypeEquivalence>
     <FeatureUefChainmanager>true</FeatureUefChainmanager>
diff --git a/src/mscorlib/src/System/Threading/SynchronizationContext.cs b/src/mscorlib/src/System/Threading/SynchronizationContext.cs
index 7e573f4..19f32ee 100644
--- a/src/mscorlib/src/System/Threading/SynchronizationContext.cs
+++ b/src/mscorlib/src/System/Threading/SynchronizationContext.cs
@@ -27,14 +27,12 @@ namespace System.Threading
     using System.Diagnostics.CodeAnalysis;
 
 
-#if FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
     [Flags]
     enum SynchronizationContextProperties
     {
         None = 0,
         RequireWaitNotification = 0x1
     };
-#endif
 
 #if FEATURE_COMINTEROP && FEATURE_APPX
     //
@@ -50,15 +48,12 @@ namespace System.Threading
 
     public class SynchronizationContext
     {
-#if FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
         SynchronizationContextProperties _props = SynchronizationContextProperties.None;
-#endif
         
         public SynchronizationContext()
         {
         }
                         
-#if FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
 
         // helper delegate to statically bind to Wait method
         private delegate int WaitDelegate(IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout);
@@ -107,7 +102,6 @@ namespace System.Threading
         {
             return ((_props & SynchronizationContextProperties.RequireWaitNotification) != 0);  
         }
-#endif
 
     
         public virtual void Send(SendOrPostCallback d, Object state)
@@ -135,7 +129,6 @@ namespace System.Threading
         {
         }
 
-#if FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
         // Method called when the CLR does a wait operation
         [CLSCompliant(false)]
         [PrePrepareMethod]
@@ -166,7 +159,6 @@ namespace System.Threading
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         private static extern int WaitHelperNative(IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout);
-#endif
 
         public static void SetSynchronizationContext(SynchronizationContext syncContext)
         {
@@ -258,11 +250,9 @@ namespace System.Threading
             return new SynchronizationContext();
         }
 
-#if FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
         private static int InvokeWaitMethodHelper(SynchronizationContext syncContext, IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
         {
             return syncContext.Wait(waitHandles, waitAll, millisecondsTimeout);
         }
-#endif
     }
 }
-- 
2.7.4