Skip to content

Commit 2ed58de

Browse files
edwardnealedwardneal
committed
Merge main
2 parents 84ae624 + 55cc333 commit 2ed58de

File tree

80 files changed

+9465
-222
lines changed

Some content is hidden

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

80 files changed

+9465
-222
lines changed

‎CHANGELOG.md‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,75 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66

77
# Release Notes
88

9+
## [Stable Release 6.1.0] - 2025-07-25
10+
11+
This update brings the following changes since the
12+
[6.1.0-preview2](release-notes/6.1/6.1.0-preview2.md) release:
13+
14+
### Added
15+
16+
No new features were added.
17+
18+
### Fixed
19+
20+
- Fixed missing socket error codes on non-Windows platforms.
21+
([#3475](https://github.com/dotnet/SqlClient/pull/3475))
22+
- Fixed primary/secondary server SPN handling during SSPI negotiation.
23+
([#3478](https://github.com/dotnet/SqlClient/pull/3478))
24+
- Fixed AzureKeyVaultProvider package key caching to serialize Azure key fetch
25+
operations.
26+
([#3477](https://github.com/dotnet/SqlClient/pull/3477))
27+
- Fixed a rare error related to multi-packet async text reads.
28+
([#3474](https://github.com/dotnet/SqlClient/pull/3474))
29+
- Fixed some spelling errors in the API docs.
30+
([#3500](https://github.com/dotnet/SqlClient/pull/3500))
31+
- Fixed a rare multi-packet string corruption bug.
32+
([#3513](https://github.com/dotnet/SqlClient/pull/3513))
33+
34+
### Changed
35+
36+
#### SqlDecimal type workarounds conversions
37+
38+
*What Changed:*
39+
40+
- Changed how SqlDecimal type workarounds perform conversions to meet
41+
compliance policies.
42+
([#3467](https://github.com/dotnet/SqlClient/pull/3467))
43+
44+
*Who Benefits:*
45+
46+
- Microsoft products must not use undocumented APIs on other Microsoft products.
47+
This change removes calls to undocumented APIs and replaces them with
48+
compliant API use.
49+
50+
*Impact:*
51+
52+
- These changes impose an observed 5% decrease in performance on .NET Framework.
53+
54+
#### SqlVector API improvements
55+
56+
*What Changed:*
57+
58+
- Several changes were made to the SqlVector API published in the
59+
[6.1.0-preview2](release-notes/6.1/6.1.0-preview2.md) release
60+
([#3472](https://github.com/dotnet/SqlClient/pull/3472)):
61+
- The SqlVector class was changed to a readonly struct.
62+
- The null value constructor was changed to a static `CreateNull()` method.
63+
- The `Size` property was removed.
64+
65+
*Who Benefits:*
66+
67+
- SqlVector instances gain the efficiencies of struct handling.
68+
69+
*Impact:*
70+
71+
- Early-adopter applications may require updates if they rely on the old APIs
72+
and any class-specific behaviour.
73+
974
## [Preview Release 6.1.0-preview2.25178.5] - 2025-06-27
1075

11-
This update brings the following changes since the [6.1.0-preview1](release-notes/6.1/6.1.0-preview1.md) release:
76+
This update brings the following changes since the
77+
[6.1.0-preview1](release-notes/6.1/6.1.0-preview1.md) release:
1278

1379
### Added
1480

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
General contribution guidance is included in this document. Additional guidance is defined in the documents linked below.
44

5-
- [Copyright](copyright.md) describes the licensing practices for the project.
5+
- [Copyright](COPYRIGHT.md) describes the licensing practices for the project.
66
- [Contribution Workflow](contributing-workflow.md) describes the workflow that the team uses for considering and accepting changes.
77

88
## Up for Grabs

‎eng/pipelines/dotnet-sqlclient-ci-core.yml‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -366,36 +366,37 @@ stages:
366366
LocalDbAppName: $(LocalDbAppName)
367367
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
368368

369-
${{ if eq(variables['system.pullRequest.isFork'], 'False') }}: # only run enclave jobs if the password is available
370-
windows_enclave_sql:
371-
pool: ADO-CI-AE-1ES-Pool
372-
images:
373-
Win22_Enclave_Sql19: ADO-MMS22-SQL19
374-
TargetFrameworks: ${{parameters.targetFrameworks }}
375-
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
376-
buildPlatforms: ${{parameters.buildPlatforms }}
377-
testSets: [AE]
378-
useManagedSNI: ${{parameters.useManagedSNI }}
379-
codeCovTargetFrameworks: ${{parameters.codeCovTargetFrameworks }}
380-
configSqlFor: enclave
381-
operatingSystem: Windows
382-
configProperties:
383-
# config.json properties
384-
TCPConnectionStringHGSVBS: $(SQL_TCP_CONN_STRING_HGSVBS)
385-
TCPConnectionStringNoneVBS: $(SQL_TCP_CONN_STRING_NoneVBS)
386-
TCPConnectionStringAASSGX: $(SQL_TCP_CONN_STRING_AASSGX)
387-
EnclaveEnabled: true
388-
AADAuthorityURL: $(AADAuthorityURL)
389-
AADServicePrincipalId: $(AADServicePrincipalId)
390-
${{ if eq(variables['system.pullRequest.isFork'], 'False') }}:
391-
AADServicePrincipalSecret: $(AADServicePrincipalSecret)
392-
AzureKeyVaultUrl: $(AzureKeyVaultUrl)
393-
AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
394-
SupportsIntegratedSecurity: $(SupportsIntegratedSecurity)
395-
UserManagedIdentityClientId: $(UserManagedIdentityClientId)
396-
AliasName: $(SQLAliasName)
397-
LocalDbAppName: $(LocalDbAppName)
398-
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
369+
# Enclave tests disabled as on 2025-08-05 due to azure capacity issues. Reenable once instances are available again.
370+
# ${{ if eq(variables['system.pullRequest.isFork'], 'False') }}: # only run enclave jobs if the password is available
371+
# windows_enclave_sql:
372+
# pool: ADO-CI-AE-1ES-Pool
373+
# images:
374+
# Win22_Enclave_Sql19: ADO-MMS22-SQL19
375+
# TargetFrameworks: ${{parameters.targetFrameworks }}
376+
# netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
377+
# buildPlatforms: ${{parameters.buildPlatforms }}
378+
# testSets: [AE]
379+
# useManagedSNI: ${{parameters.useManagedSNI }}
380+
# codeCovTargetFrameworks: ${{parameters.codeCovTargetFrameworks }}
381+
# configSqlFor: enclave
382+
# operatingSystem: Windows
383+
# configProperties:
384+
# # config.json properties
385+
# TCPConnectionStringHGSVBS: $(SQL_TCP_CONN_STRING_HGSVBS)
386+
# TCPConnectionStringNoneVBS: $(SQL_TCP_CONN_STRING_NoneVBS)
387+
# TCPConnectionStringAASSGX: $(SQL_TCP_CONN_STRING_AASSGX)
388+
# EnclaveEnabled: true
389+
# AADAuthorityURL: $(AADAuthorityURL)
390+
# AADServicePrincipalId: $(AADServicePrincipalId)
391+
# ${{ if eq(variables['system.pullRequest.isFork'], 'False') }}:
392+
# AADServicePrincipalSecret: $(AADServicePrincipalSecret)
393+
# AzureKeyVaultUrl: $(AzureKeyVaultUrl)
394+
# AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
395+
# SupportsIntegratedSecurity: $(SupportsIntegratedSecurity)
396+
# UserManagedIdentityClientId: $(UserManagedIdentityClientId)
397+
# AliasName: $(SQLAliasName)
398+
# LocalDbAppName: $(LocalDbAppName)
399+
# LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
399400

400401
# self hosted SQL Server on Linux
401402
linux_sql_19_22:
@@ -452,34 +453,35 @@ stages:
452453
LocalDbAppName: $(LocalDbAppName)
453454
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
454455

455-
${{ if eq(variables['system.pullRequest.isFork'], 'False') }}: # only run enclave jobs if the password is available
456-
linux_enclave_sql:
457-
pool: ADO-CI-AE-1ES-Pool
458-
images:
459-
Ubuntu20_Enclave_Sql19: ADO-UB20-Sql22
460-
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
461-
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
462-
buildPlatforms: [AnyCPU]
463-
testSets: [AE]
464-
useManagedSNI: [true]
465-
codeCovTargetFrameworks: ${{parameters.codeCovTargetFrameworks }}
466-
configSqlFor: enclave
467-
operatingSystem: Linux
468-
configProperties:
469-
# config.json properties
470-
TCPConnectionStringHGSVBS: $(SQL_TCP_CONN_STRING_HGSVBS)
471-
TCPConnectionStringNoneVBS: $(SQL_TCP_CONN_STRING_NoneVBS)
472-
TCPConnectionStringAASSGX: $(SQL_TCP_CONN_STRING_AASSGX)
473-
EnclaveEnabled: true
474-
AADServicePrincipalId: $(AADServicePrincipalId)
475-
${{ if eq(variables['system.pullRequest.isFork'], 'False') }}:
476-
AADServicePrincipalSecret: $(AADServicePrincipalSecret)
477-
AzureKeyVaultUrl: $(AzureKeyVaultUrl)
478-
AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
479-
SupportsIntegratedSecurity: false
480-
UserManagedIdentityClientId: $(UserManagedIdentityClientId)
481-
LocalDbAppName: $(LocalDbAppName)
482-
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
456+
# Enclave tests disabled as on 2025-08-05 due to azure capacity issues. Reenable once instances are available again.
457+
# ${{ if eq(variables['system.pullRequest.isFork'], 'False') }}: # only run enclave jobs if the password is available
458+
# linux_enclave_sql:
459+
# pool: ADO-CI-AE-1ES-Pool
460+
# images:
461+
# Ubuntu20_Enclave_Sql19: ADO-UB20-Sql22
462+
# TargetFrameworks: ${{parameters.targetFrameworksLinux }}
463+
# netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
464+
# buildPlatforms: [AnyCPU]
465+
# testSets: [AE]
466+
# useManagedSNI: [true]
467+
# codeCovTargetFrameworks: ${{parameters.codeCovTargetFrameworks }}
468+
# configSqlFor: enclave
469+
# operatingSystem: Linux
470+
# configProperties:
471+
# # config.json properties
472+
# TCPConnectionStringHGSVBS: $(SQL_TCP_CONN_STRING_HGSVBS)
473+
# TCPConnectionStringNoneVBS: $(SQL_TCP_CONN_STRING_NoneVBS)
474+
# TCPConnectionStringAASSGX: $(SQL_TCP_CONN_STRING_AASSGX)
475+
# EnclaveEnabled: true
476+
# AADServicePrincipalId: $(AADServicePrincipalId)
477+
# ${{ if eq(variables['system.pullRequest.isFork'], 'False') }}:
478+
# AADServicePrincipalSecret: $(AADServicePrincipalSecret)
479+
# AzureKeyVaultUrl: $(AzureKeyVaultUrl)
480+
# AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
481+
# SupportsIntegratedSecurity: false
482+
# UserManagedIdentityClientId: $(UserManagedIdentityClientId)
483+
# LocalDbAppName: $(LocalDbAppName)
484+
# LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
483485

484486
# Self hosted SQL Server on Mac
485487
mac_sql_22:

0 commit comments

Comments
 (0)