Skip to content

Commit 5e7fe95

Browse files
committed
Rebase main & Move RuntimeHelpers
1 parent 521796d commit 5e7fe95

File tree

5 files changed

+2
-6
lines changed

5 files changed

+2
-6
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,11 +628,11 @@
628628
<Compile Include="Common\System\Net\Security\SecurityBufferType.cs" />
629629
<Compile Include="Common\System\Net\SecurityStatusPal.cs" />
630630
<Compile Include="Common\System\Threading\Tasks\TaskToApm.cs" />
631-
<Compile Include="Common\System\Runtime\CompilerServicesOverride\RuntimeHelpers.cs" />
632631
<Compile Include="Interop\SNINativeMethodWrapper.Common.cs" />
633632
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
634633
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
635634
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetCoreApp.cs" />
635+
<Compile Include="Microsoft\Data\SqlClient\RuntimeHelpers.cs" />
636636
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
637637
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
638638
<Compile Include="Microsoft\Data\SqlClient\SNI\SNICommon.cs" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Diagnostics;
22

3-
namespace System.Runtime.CompilerServicesOverride
3+
namespace Microsoft.Data.SqlClient
44
{
55
internal struct RuntimeHelpers
66
{

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDataReader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using System.Globalization;
1515
using System.IO;
1616
using System.Reflection;
17-
using RuntimeHelpers = System.Runtime.CompilerServicesOverride.RuntimeHelpers;
1817
using System.Runtime.CompilerServices;
1918
using System.Text;
2019
using System.Text.Json;

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System;
66
using System.Diagnostics;
77
using System.Buffers.Binary;
8-
using System.Runtime.CompilerServicesOverride;
98
using System.Runtime.InteropServices;
109
using System.Security;
1110
using System.Threading;

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ namespace Microsoft.Data.SqlClient
1717
#if NETFRAMEWORK
1818
using PacketHandle = IntPtr;
1919
using RuntimeHelpers = System.Runtime.CompilerServices.RuntimeHelpers;
20-
#else
21-
using System.Runtime.CompilerServicesOverride;
2220
#endif
2321

2422
sealed internal class LastIOTimer

0 commit comments

Comments
 (0)