Skip to content

Commit f984082

Browse files
edwardnealedwardneal
committed
Merge branch 'main' into remove-contextconnection-sqlcommand-paths
2 parents 8edc110 + c3857b1 commit f984082

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1046
-1732
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Common/System/NotImplemented.cs

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

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

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
142142
</Compile>
143143
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
144-
<Link>Common\Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
144+
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
145145
</Compile>
146146
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\FieldNameLookup.cs">
147147
<Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
@@ -152,8 +152,8 @@
152152
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
153153
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
154154
</Compile>
155-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.cs">
156-
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.cs</Link>
155+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs">
156+
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs</Link>
157157
</Compile>
158158
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs">
159159
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs</Link>
@@ -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>
@@ -656,11 +656,14 @@
656656
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
657657
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
658658
</Compile>
659-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
660-
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
659+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
660+
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
661661
</Compile>
662-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
663-
<Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
662+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
663+
<Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
664+
</Compile>
665+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
666+
<Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
664667
</Compile>
665668
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPool.cs">
666669
<Link>Microsoft\Data\SqlClient\Utilities\ObjectPool.cs</Link>
@@ -725,8 +728,6 @@
725728
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
726729
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
727730
</Compile>
728-
729-
<Compile Include="Common\System\NotImplemented.cs" />
730731
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
731732
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
732733
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
@@ -782,34 +783,34 @@
782783
<Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
783784
</Compile>
784785
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\CreateDisposition.cs">
785-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\CreateDisposition.cs</Link>
786+
<Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
786787
</Compile>
787788
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\CreateOptions.cs">
788-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\CreateOptions.cs</Link>
789+
<Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
789790
</Compile>
790791
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\DesiredAccess.cs">
791-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\DesiredAccess.cs</Link>
792+
<Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
792793
</Compile>
793794
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\FileFullEaInformation.cs">
794-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
795+
<Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
795796
</Compile>
796797
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ImpersonationLevel.cs">
797-
<Link>Interop\Windows\NtDll\ImpersonaltionLevel.cs</Link>
798+
<Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
798799
</Compile>
799800
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\IoStatusBlock.cs">
800801
<Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
801802
</Compile>
802803
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\NtDll.cs">
803-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\NtDll.cs</Link>
804+
<Link>Interop\Windows\NtDll\NtDll.cs</Link>
804805
</Compile>
805806
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ObjectAttributeFlags.cs">
806-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\ObjectAttributes.cs</Link>
807+
<Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
807808
</Compile>
808809
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ObjectAttributes.cs">
809-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\ObjectAttributes.cs</Link>
810+
<Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
810811
</Compile>
811812
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\SecurityQualityOfService.cs">
812-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
813+
<Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
813814
</Compile>
814815
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Sni\AuthProviderInfo.cs">
815816
<Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
@@ -865,15 +866,15 @@
865866
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
866867
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
867868
</Compile>
868-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
869-
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
870-
</Compile>
871869
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs">
872870
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
873871
</Compile>
874872
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs">
875873
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs</Link>
876874
</Compile>
875+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
876+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
877+
</Compile>
877878
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Windows.cs">
878879
<Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Windows.cs</Link>
879880
</Compile>
@@ -889,8 +890,8 @@
889890
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
890891
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs</Link>
891892
</Compile>
892-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
893-
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
893+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
894+
<Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
894895
</Compile>
895896
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
896897
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs</Link>
@@ -915,6 +916,9 @@
915916
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
916917
<Link>Microsoft\Data\Common\AdapterUtil.Unix.cs</Link>
917918
</Compile>
919+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.netcore.Unix.cs">
920+
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.netcore.Unix.cs</Link>
921+
</Compile>
918922
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs">
919923
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs</Link>
920924
</Compile>
@@ -942,8 +946,7 @@
942946
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs">
943947
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs</Link>
944948
</Compile>
945-
946-
<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
949+
947950
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
948951
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
949952
</ItemGroup>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal sealed partial class TdsParser
4444
private static int _objectTypeCount; // EventSource counter
4545
private readonly SqlClientLogger _logger = new SqlClientLogger();
4646

47-
private SSPIContextProvider _authenticationProvider;
47+
private SspiContextProvider _authenticationProvider;
4848

4949
internal readonly int _objectID = Interlocked.Increment(ref _objectTypeCount);
5050
internal int ObjectID => _objectID;
@@ -413,7 +413,7 @@ internal void Connect(ServerInfo serverInfo,
413413
// AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
414414
if (integratedSecurity || authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
415415
{
416-
_authenticationProvider = _physicalStateObj.CreateSSPIContextProvider();
416+
_authenticationProvider = _physicalStateObj.CreateSspiContextProvider();
417417
SqlClientEventSource.Log.TryTraceEvent("TdsParser.Connect | SEC | SSPI or Active Directory Authentication Library loaded for SQL Server based integrated authentication");
418418
}
419419

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectManaged.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ private SNIHandle GetSessionSNIHandleHandleOrThrow()
407407
[MethodImpl(MethodImplOptions.NoInlining)] // this forces the exception throwing code not to be inlined for performance
408408
private void ThrowClosedConnection() => throw ADP.ClosedConnectionError();
409409

410-
internal override SSPIContextProvider CreateSSPIContextProvider()
411-
=> new NegotiateSSPIContextProvider();
410+
internal override SspiContextProvider CreateSspiContextProvider()
411+
=> new NegotiateSspiContextProvider();
412412
}
413413
}

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ internal override void DisposePacketCache()
449449
}
450450
}
451451

452-
internal override SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();
452+
internal override SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();
453453

454454
internal sealed class WritePacketCache : IDisposable
455455
{

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

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,17 @@
354354
<Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
355355
<Link>Resources\ResCategoryAttribute.cs</Link>
356356
</Compile>
357-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
358-
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
357+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
358+
<Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
359359
</Compile>
360-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
361-
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
360+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
361+
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
362362
</Compile>
363-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
364-
<Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
363+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
364+
<Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
365+
</Compile>
366+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
367+
<Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
365368
</Compile>
366369
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
367370
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
@@ -519,6 +522,15 @@
519522
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
520523
<Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
521524
</Compile>
525+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiConnection.netfx.cs">
526+
<Link>Microsoft\Data\SqlClient\Server\SmiConnection.netfx.cs</Link>
527+
</Compile>
528+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiContext.netfx.cs">
529+
<Link>Microsoft\Data\SqlClient\Server\SmiContext.netfx.cs</Link>
530+
</Compile>
531+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiContextFactory.netfx.cs">
532+
<Link>Microsoft\Data\SqlClient\Server\SmiContextFactory.netfx.cs</Link>
533+
</Compile>
522534
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink.cs">
523535
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink.cs</Link>
524536
</Compile>
@@ -528,9 +540,21 @@
528540
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_Default.netfx.cs">
529541
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.netfx.cs</Link>
530542
</Compile>
543+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_DeferredProcessing.netfx.cs">
544+
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_DeferredProcessing.netfx.cs</Link>
545+
</Compile>
546+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventStream.netfx.cs">
547+
<Link>Microsoft\Data\SqlClient\Server\SmiEventStream.netfx.cs</Link>
548+
</Compile>
549+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiExecuteType.netfx.cs">
550+
<Link>Microsoft\Data\SqlClient\Server\SmiExecuteType.netfx.cs</Link>
551+
</Compile>
531552
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
532553
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
533554
</Compile>
555+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiLink.netfx.cs">
556+
<Link>Microsoft\Data\SqlClient\Server\SmiLink.netfx.cs</Link>
557+
</Compile>
534558
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
535559
<Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
536560
</Compile>
@@ -540,14 +564,20 @@
540564
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs">
541565
<Link>Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs</Link>
542566
</Compile>
567+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiRequestExecutor.netfx.cs">
568+
<Link>Microsoft\Data\SqlClient\Server\SmiRequestExecutor.netfx.cs</Link>
569+
</Compile>
543570
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
544571
<Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
545572
</Compile>
573+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiStream.netfx.cs">
574+
<Link>Microsoft\Data\SqlClient\Server\SmiStream.netfx.cs</Link>
575+
</Compile>
546576
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
547577
<Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
548578
</Compile>
549-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.Common.cs">
550-
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccess.Common.cs</Link>
579+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
580+
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccess.cs</Link>
551581
</Compile>
552582
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
553583
<Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
@@ -567,6 +597,9 @@
567597
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
568598
<Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
569599
</Compile>
600+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs">
601+
<Link>Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs</Link>
602+
</Compile>
570603
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
571604
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
572605
</Compile>
@@ -901,16 +934,6 @@
901934
<ItemGroup>
902935
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
903936
<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" />
914937
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.netfx.cs" />
915938
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
916939
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />

0 commit comments

Comments
 (0)