Skip to content

Commit 2ddb065

Browse files
cheenamalhotracheenamalhotra
authored
Merge branch 'main' into dev/cheena/central-package-mgmnt
2 parents 58e91c8 + dc1298a commit 2ddb065

File tree

76 files changed

+3129
-4173
lines changed

Some content is hidden

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

76 files changed

+3129
-4173
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+
#==============================================================================

‎eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,22 @@ extends:
8484
featureFlags:
8585
WindowsHostVersion: 1ESWindows2022
8686
globalSdl: # https://aka.ms/obpipelines/sdl
87+
tsa:
88+
# The OneBranch template will set 'break' to false for the other SDL
89+
# tools when TSA is enabled. This allows TSA to gather the results
90+
# and publish them for downstream analysis.
91+
enabled: ${{parameters.enableAllSdlTools }}
8792
apiscan:
88-
enabled: ${{ not(parameters['isPreview']) }}
93+
enabled: ${{parameters.enableAllSdlTools }}
94+
# For non-official builds, the OneBranch template seems to set APIScan's
95+
# 'break' to true even when TSA is enabled. We don't want APIScan to
96+
# break non-official builds, so we explicitly set 'break' to false here.
97+
${{ if ne(parameters.oneBranchType, 'Official') }}:
98+
break: false
8999
softwareFolder: $(softwareFolder)
90100
symbolsFolder: $(symbolsFolder)
91101
softwarename: Microsoft.Data.SqlClient
92102
versionNumber: $(AssemblyFileVersion)
93-
tsa:
94-
enabled: ${{ not(parameters['isPreview']) }} # onebranch publish all sdl results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
95103
codeql:
96104
compiled:
97105
enabled: ${{ not(parameters['isPreview']) }}

‎eng/pipelines/libraries/common-variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ variables:
3838
- name: Preview
3939
value: '-preview'
4040
- name: Revision
41-
value: '1'
41+
value: '2'
4242

4343
- name: NugetPackageVersion
4444
value: $(Major).$(Minor).$(Patch)

‎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: 46 additions & 32 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,7 +728,6 @@
725728
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
726729
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
727730
</Compile>
728-
<Compile Include="Common\System\NotImplemented.cs" />
729731
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
730732
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
731733
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
@@ -780,34 +782,34 @@
780782
<Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
781783
</Compile>
782784
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\CreateDisposition.cs">
783-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\CreateDisposition.cs</Link>
785+
<Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
784786
</Compile>
785787
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\CreateOptions.cs">
786-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\CreateOptions.cs</Link>
788+
<Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
787789
</Compile>
788790
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\DesiredAccess.cs">
789-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\DesiredAccess.cs</Link>
791+
<Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
790792
</Compile>
791793
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\FileFullEaInformation.cs">
792-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
794+
<Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
793795
</Compile>
794796
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ImpersonationLevel.cs">
795-
<Link>Interop\Windows\NtDll\ImpersonaltionLevel.cs</Link>
797+
<Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
796798
</Compile>
797799
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\IoStatusBlock.cs">
798800
<Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
799801
</Compile>
800802
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\NtDll.cs">
801-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\NtDll.cs</Link>
803+
<Link>Interop\Windows\NtDll\NtDll.cs</Link>
802804
</Compile>
803805
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ObjectAttributeFlags.cs">
804-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\ObjectAttributes.cs</Link>
806+
<Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
805807
</Compile>
806808
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\ObjectAttributes.cs">
807-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\ObjectAttributes.cs</Link>
809+
<Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
808810
</Compile>
809811
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\SecurityQualityOfService.cs">
810-
<Link>Interop\Windows\NtDll\Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
812+
<Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
811813
</Compile>
812814
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Sni\AuthProviderInfo.cs">
813815
<Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
@@ -863,52 +865,57 @@
863865
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
864866
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
865867
</Compile>
866-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
867-
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
868-
</Compile>
869868
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs">
870869
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
871870
</Compile>
872871
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs">
873872
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs</Link>
874873
</Compile>
874+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
875+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
876+
</Compile>
875877
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Windows.cs">
876878
<Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Windows.cs</Link>
877879
</Compile>
878880
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netcore.Windows.cs">
879881
<Link>Microsoft\Data\SqlClient\PacketHandle.netcore.Windows.cs</Link>
880882
</Compile>
881-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.Windows.cs">
882-
<Link>Microsoft\Data\SqlClient\SessionHandle.netcore.Windows.cs</Link>
883+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.Windows.cs">
884+
<Link>Microsoft\Data\SqlClient\SessionHandle.Windows.cs</Link>
883885
</Compile>
884886
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs">
885887
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs</Link>
886888
</Compile>
887889
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
888890
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs</Link>
889891
</Compile>
890-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
891-
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
892+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
893+
<Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
892894
</Compile>
893895
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
894896
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs</Link>
895897
</Compile>
896898
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.Windows.cs">
897899
<Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.Windows.cs</Link>
898900
</Compile>
901+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs">
902+
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs</Link>
903+
</Compile>
899904
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs">
900905
<Link>Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs</Link>
901906
</Compile>
902907
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Windows.cs" />
903908
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />
904909
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
905-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />
906910
</ItemGroup>
907911
<!-- Unix only -->
908912
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
909913
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
910914
<Link>Microsoft\Data\Common\AdapterUtil.Unix.cs</Link>
911915
</Compile>
916+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.netcore.Unix.cs">
917+
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.netcore.Unix.cs</Link>
918+
</Compile>
912919
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs">
913920
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs</Link>
914921
</Compile>
@@ -921,16 +928,23 @@
921928
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.Unix.cs">
922929
<Link>Microsoft\Data\SqlClient\SessionHandle.netcore.Unix.cs</Link>
923930
</Compile>
931+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.netcore.Unix.cs">
932+
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCertificateStoreProvider.netcore.Unix.cs</Link>
933+
</Compile>
934+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.Unix.cs">
935+
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCngProvider.netcore.Unix.cs</Link>
936+
</Compile>
937+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.Unix.cs">
938+
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCspProvider.netcore.Unix.cs</Link>
939+
</Compile>
940+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Unix.cs">
941+
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Unix.cs</Link>
942+
</Compile>
924943
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs">
925944
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs</Link>
926945
</Compile>
927-
<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
928946
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
929-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Unix.cs" />
930-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Unix.cs" />
931-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Unix.cs" />
932947
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
933-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
934948
</ItemGroup>
935949
<!-- Resources -->
936950
<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)