Skip to content

Commit 4bebb1b

Browse files
mdaiglemdaigle
committed
Merge main
2 parents 540e93f + dc1298a commit 4bebb1b

Some content is hidden

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

46 files changed

+2181
-3395
lines changed

‎.github/CODEOWNERS‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#==============================================================================
2+
# This is the global GitHub code owners file for the SqlClient repo. No other
3+
# CODEOWNERS files should exist in the repo.
4+
#
5+
# Code owners documentation is here:
6+
#
7+
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
8+
9+
# The entire repo is owned by the SqlClientDevTeam GitHub team:
10+
#
11+
# https://github.com/orgs/dotnet/teams/sqlclientdevteam
12+
#
13+
# This team must be configured with write access to the repo for code ownership
14+
# rules to apply.
15+
#
16+
# The main branch should also be protected and require all PRs to be approved
17+
# by owners. See:
18+
#
19+
# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches#require-pull-request-reviews-before-merging
20+
#
21+
# There should be no other owners specified in the repo.
22+
#
23+
* @dotnet/sqlclientdevteam
24+
25+
#==============================================================================

‎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: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
145145
</Compile>
146146
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
147-
<Link>Common\Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
147+
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
148148
</Compile>
149149
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\FieldNameLookup.cs">
150150
<Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
@@ -155,8 +155,8 @@
155155
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
156156
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
157157
</Compile>
158-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.cs">
159-
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.cs</Link>
158+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs">
159+
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs</Link>
160160
</Compile>
161161
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs">
162162
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs</Link>
@@ -383,8 +383,8 @@
383383
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
384384
<Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
385385
</Compile>
386-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.Common.cs">
387-
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.Common.cs</Link>
386+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
387+
<Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs</Link>
388388
</Compile>
389389
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
390390
<Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
@@ -659,11 +659,14 @@
659659
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
660660
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
661661
</Compile>
662-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
663-
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
662+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
663+
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
664664
</Compile>
665-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
666-
<Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
665+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
666+
<Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
667+
</Compile>
668+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
669+
<Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
667670
</Compile>
668671
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPool.cs">
669672
<Link>Microsoft\Data\SqlClient\Utilities\ObjectPool.cs</Link>
@@ -728,8 +731,6 @@
728731
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
729732
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
730733
</Compile>
731-
732-
<Compile Include="Common\System\NotImplemented.cs" />
733734
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
734735
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
735736
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
@@ -785,34 +786,34 @@
785786
<Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
786787
</Compile>
787788
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\CreateDisposition.cs">
788-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\CreateDisposition.cs</Link>
789+
<Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
789790
</Compile>
790791
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\CreateOptions.cs">
791-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\CreateOptions.cs</Link>
792+
<Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
792793
</Compile>
793794
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\DesiredAccess.cs">
794-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\DesiredAccess.cs</Link>
795+
<Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
795796
</Compile>
796797
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\FileFullEaInformation.cs">
797-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
798+
<Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
798799
</Compile>
799800
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ImpersonationLevel.cs">
800-
<Link>Interop\Windows\NtDll\ImpersonaltionLevel.cs</Link>
801+
<Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
801802
</Compile>
802803
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\IoStatusBlock.cs">
803804
<Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
804805
</Compile>
805806
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\NtDll.cs">
806-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\NtDll.cs</Link>
807+
<Link>Interop\Windows\NtDll\NtDll.cs</Link>
807808
</Compile>
808809
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ObjectAttributeFlags.cs">
809-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\ObjectAttributes.cs</Link>
810+
<Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
810811
</Compile>
811812
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ObjectAttributes.cs">
812-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\ObjectAttributes.cs</Link>
813+
<Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
813814
</Compile>
814815
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\SecurityQualityOfService.cs">
815-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
816+
<Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
816817
</Compile>
817818
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Sni\AuthProviderInfo.cs">
818819
<Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
@@ -868,32 +869,32 @@
868869
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
869870
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
870871
</Compile>
871-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
872-
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
873-
</Compile>
874872
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs">
875873
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
876874
</Compile>
877875
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs">
878876
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs</Link>
879877
</Compile>
878+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
879+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
880+
</Compile>
880881
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Windows.cs">
881882
<Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Windows.cs</Link>
882883
</Compile>
883884
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netcore.Windows.cs">
884885
<Link>Microsoft\Data\SqlClient\PacketHandle.netcore.Windows.cs</Link>
885886
</Compile>
886-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.Windows.cs">
887-
<Link>Microsoft\Data\SqlClient\SessionHandle.netcore.Windows.cs</Link>
887+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.Windows.cs">
888+
<Link>Microsoft\Data\SqlClient\SessionHandle.Windows.cs</Link>
888889
</Compile>
889890
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs">
890891
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs</Link>
891892
</Compile>
892893
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
893894
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs</Link>
894895
</Compile>
895-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
896-
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
896+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
897+
<Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
897898
</Compile>
898899
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
899900
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs</Link>
@@ -918,6 +919,9 @@
918919
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
919920
<Link>Microsoft\Data\Common\AdapterUtil.Unix.cs</Link>
920921
</Compile>
922+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.netcore.Unix.cs">
923+
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.netcore.Unix.cs</Link>
924+
</Compile>
921925
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs">
922926
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs</Link>
923927
</Compile>
@@ -945,8 +949,7 @@
945949
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs">
946950
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs</Link>
947951
</Compile>
948-
949-
<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
952+
950953
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
951954
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
952955
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt
136136
opt = new SqlConnectionString(opt, instanceName, userInstance: false, setEnlistValue: null);
137137
poolGroupProviderInfo = null; // null so we do not pass to constructor below...
138138
}
139-
return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback);
139+
return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback);
140140
}
141141

142142
protected override DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous)

0 commit comments

Comments
 (0)