[System.Private.Xml.Linq] Remove SILVERLIGHT define (#29025)

2 files changed, 2 insertions, 18 deletions

diff --git a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
index 1d5ade2524..0f9c0a1495 100644
--- a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
+++ b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
@@ -5,7 +5,6 @@
     <ProjectGuid>{BAC347A3-9841-44FC-B1E3-2344D1152C23}</ProjectGuid>
     <AssemblyName>System.Private.Xml.Linq</AssemblyName>
     <RootNamespace>System.Xml</RootNamespace>
-    <DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
     <DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants);uap</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
@@ -71,6 +70,7 @@
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Thread" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs b/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs
index ae13f99791..caeeac837c 100644
--- a/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs
+++ b/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs
@@ -2,6 +2,7 @@
 // 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.Threading;
 using Debug = System.Diagnostics.Debug;
 using Interlocked = System.Threading.Interlocked;
 
@@ -109,17 +110,8 @@ namespace System.Xml.Linq
                 lock (this)
                 {
                     XHashtableState newState = _state.Resize();
-
                     // Use memory barrier to ensure that the resized XHashtableState object is fully constructed before it is assigned
-#if !SILVERLIGHT 
                     Thread.MemoryBarrier();
-#else // SILVERLIGHT
-                    // The MemoryBarrier method usage is probably incorrect and should be removed.
-
-                    // Replacing with Interlocked.CompareExchange for now (with no effect)
-                    //   which will do a very similar thing to MemoryBarrier (it's just slower)
-                    System.Threading.Interlocked.CompareExchange<XHashtableState>(ref _state, null, null);
-#endif // SILVERLIGHT
                     _state = newState;
                 }
             }
@@ -302,15 +294,7 @@ namespace System.Xml.Linq
 
                 // Ensure that all writes to the entry can't be reordered past this barrier (or other threads might see new entry
                 // in list before entry has been initialized!).
-#if !SILVERLIGHT
                 Thread.MemoryBarrier();
-#else // SILVERLIGHT
-                // The MemoryBarrier method usage is probably incorrect and should be removed.
-
-                // Replacing with Interlocked.CompareExchange for now (with no effect)
-                //   which will do a very similar thing to MemoryBarrier (it's just slower)
-                System.Threading.Interlocked.CompareExchange<Entry[]>(ref _entries, null, null);
-#endif // SILVERLIGHT
 
                 // Loop until a matching entry is found, a new entry is added, or linked list is found to be full
                 entryIndex = 0;