Skip to content

Commit b3a72fc

Browse files
benrr101benrr101
authored
Merge | Netfx SMI Classes (#3326)
* Move SmiConnection.cs to SmiConnection.netfx.cs in common project * Move SmiContext.cs to SmiContext.netfx.cs in common project * Move SmiContextFactory.cs to SmiContextFactory.netfx.cs in common project, some very light cleanup * Moving SmiEventSink_DeferedProcessing.cs to SmiEventSink_DeferredProcessing.netfx.cs * Move SmiEventStream.cs to SmiEventStream.netfx.cs, make dispose obsolete * Moving SmiExecuteType.cs to SmiExecuteType.netfx.cs in common project * Move SmiLink.cs to SmiLink.netfx.cs in common project * Moving SmiRequestExecutor.cs to SmiRequestExecutor.netfx.cs in common project, Removing obsolete code * Moving SmiStream.cs to SmiStream.netfx.cs in common project * Merge SmiXetterAccessMap.cs into SmiXetterAccessMap.Common.cs and rename to SmiXetterAccessMap.cs * Merge EMDEventType into TriggerAction, move TriggerAction.cs to TriggerAction.netfx.cs in common project * Patch up changes so they all build
1 parent 6c12daf commit b3a72fc

19 files changed

+615
-1531
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@
380380
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
381381
<Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
382382
</Compile>
383-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.Common.cs">
384-
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.Common.cs</Link>
383+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
384+
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs</Link>
385385
</Compile>
386386
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
387387
<Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,15 @@
519519
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
520520
<Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
521521
</Compile>
522+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiConnection.netfx.cs">
523+
<Link>Microsoft\Data\SqlClient\Server\SmiConnection.netfx.cs</Link>
524+
</Compile>
525+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiContext.netfx.cs">
526+
<Link>Microsoft\Data\SqlClient\Server\SmiContext.netfx.cs</Link>
527+
</Compile>
528+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiContextFactory.netfx.cs">
529+
<Link>Microsoft\Data\SqlClient\Server\SmiContextFactory.netfx.cs</Link>
530+
</Compile>
522531
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink.cs">
523532
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink.cs</Link>
524533
</Compile>
@@ -528,9 +537,21 @@
528537
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_Default.netfx.cs">
529538
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.netfx.cs</Link>
530539
</Compile>
540+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_DeferredProcessing.netfx.cs">
541+
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_DeferredProcessing.netfx.cs</Link>
542+
</Compile>
543+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventStream.netfx.cs">
544+
<Link>Microsoft\Data\SqlClient\Server\SmiEventStream.netfx.cs</Link>
545+
</Compile>
546+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiExecuteType.netfx.cs">
547+
<Link>Microsoft\Data\SqlClient\Server\SmiExecuteType.netfx.cs</Link>
548+
</Compile>
531549
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
532550
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
533551
</Compile>
552+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiLink.netfx.cs">
553+
<Link>Microsoft\Data\SqlClient\Server\SmiLink.netfx.cs</Link>
554+
</Compile>
534555
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
535556
<Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
536557
</Compile>
@@ -540,14 +561,20 @@
540561
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs">
541562
<Link>Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs</Link>
542563
</Compile>
564+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiRequestExecutor.netfx.cs">
565+
<Link>Microsoft\Data\SqlClient\Server\SmiRequestExecutor.netfx.cs</Link>
566+
</Compile>
543567
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
544568
<Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
545569
</Compile>
570+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiStream.netfx.cs">
571+
<Link>Microsoft\Data\SqlClient\Server\SmiStream.netfx.cs</Link>
572+
</Compile>
546573
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
547574
<Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
548575
</Compile>
549-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.Common.cs">
550-
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccess.Common.cs</Link>
576+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
577+
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccess.cs</Link>
551578
</Compile>
552579
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
553580
<Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
@@ -567,6 +594,9 @@
567594
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
568595
<Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
569596
</Compile>
597+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs">
598+
<Link>Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs</Link>
599+
</Compile>
570600
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
571601
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
572602
</Compile>
@@ -901,16 +931,6 @@
901931
<ItemGroup>
902932
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
903933
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
904-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />
905-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContext.cs" />
906-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContextFactory.cs" />
907-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_DeferedProcessing.cs" />
908-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventStream.cs" />
909-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiExecuteType.cs" />
910-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
911-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
912-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
913-
<Compile Include="Microsoft\Data\SqlClient\Server\TriggerAction.cs" />
914934
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.netfx.cs" />
915935
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
916936
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SmiConnection.cs

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)