Skip to content

Commit e56ca8c

Browse files
benrr101benrr101
committed
Merge branch 'main' into dev/russellben/remove-cer
2 parents b1e2386 + a3e87a4 commit e56ca8c

File tree

93 files changed

+9348
-240
lines changed

Some content is hidden

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

93 files changed

+9348
-240
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,19 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66

7-
# Release Notes
7+
## [Stable Release 6.1.1] - 2025-08-14
8+
9+
This update includes the following changes since the [6.1.0](6.1.0.md) release:
10+
11+
### Fixed
12+
13+
- Reverted changes related to improving partial packet detection, fixup, and replay functionality. This revert addresses regressions introduced in 6.1.0. ([#3556](https://github.com/dotnet/SqlClient/pull/3556))
14+
- Applied reference assembly corrections supporting vector, fixed JSON tests, and ensured related tests are enabled. [#3562](https://github.com/dotnet/SqlClient/pull/3562)
15+
- Fixed `SqlVector<T>.Null` API signature in Reference assembly. [#3521](https://github.com/dotnet/SqlClient/pull/3521)
16+
17+
### Changed
18+
19+
- Upgraded `Azure.Identity` and other dependencies to newer versions. ([#3538](https://github.com/dotnet/SqlClient/pull/3538)) ([#3552](https://github.com/dotnet/SqlClient/pull/3552))
820

921
## [Stable Release 6.1.0] - 2025-07-25
1022

‎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: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -366,37 +366,36 @@ stages:
366366
LocalDbAppName: $(LocalDbAppName)
367367
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
368368

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)
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)
400399

401400
# self hosted SQL Server on Linux
402401
linux_sql_19_22:
@@ -453,35 +452,34 @@ stages:
453452
LocalDbAppName: $(LocalDbAppName)
454453
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
455454

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)
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)
485483

486484
# Self hosted SQL Server on Mac
487485
mac_sql_22:

‎eng/pipelines/variables/akv-official-variables.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ variables:
2222

2323
# Base Variables -------------------------------------------------------
2424
- name: mdsPackageVersion
25-
value: '6.0.1'
25+
value: '6.1.1'
2626

2727
# @TODO: Version should ideally be pulled from one location (versions.props?)
2828
- name: versionMajor
2929
value: '6'
3030
- name: versionMinor
31-
value: '0'
31+
value: '1'
3232
- name: versionPatch
33-
value: '0'
33+
value: '1'
3434
- name: versionPreview
3535
value: '-preview1'
3636

‎release-notes/6.1/6.1.1.md‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# Release Notes
2+
3+
## Stable Release 6.1.1 - 2025-08-14
4+
5+
This update includes the following changes since the [6.1.0](6.1.0.md) release:
6+
7+
### Fixed
8+
9+
- Reverted changes related to improving partial packet detection, fixup, and replay functionality. This revert addresses regressions introduced in 6.1.0. ([#3556](https://github.com/dotnet/SqlClient/pull/3556))
10+
- Applied reference assembly corrections supporting vector, fixed JSON tests, and ensured related tests are enabled. [#3562](https://github.com/dotnet/SqlClient/pull/3562)
11+
- Fixed `SqlVector<T>.Null` API signature in Reference assembly. [#3521](https://github.com/dotnet/SqlClient/pull/3521)
12+
13+
### Changed
14+
15+
- Upgraded `Azure.Identity` and other dependencies to newer versions. ([#3538](https://github.com/dotnet/SqlClient/pull/3538)) ([#3552](https://github.com/dotnet/SqlClient/pull/3552))
16+
17+
## Target Platform Support
18+
19+
- .NET Framework 4.6.2+ (Windows ARM64, Windows x86, Windows x64)
20+
- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
21+
22+
### Dependencies
23+
24+
#### .NET Framework 4.6.2+
25+
26+
- Azure.Core 1.47.1
27+
- Azure.Identity 1.14.2
28+
- Microsoft.Bcl.Cryptography 8.0.0
29+
- Microsoft.Data.SqlClient.SNI 6.0.2
30+
- Microsoft.Extensions.Caching.Memory 8.0.1
31+
- Microsoft.IdentityModel.JsonWebTokens 7.7.1
32+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
33+
- System.Buffers 4.5.1
34+
- System.Data.Common 4.3.0
35+
- System.Security.Cryptography.Pkcs 8.0.1
36+
- System.Text.Encodings.Web 8.0.0
37+
- System.Text.Json 8.0.5
38+
39+
#### .NET 8.0
40+
41+
- Azure.Core 1.47.1
42+
- Azure.Identity 1.14.2
43+
- Microsoft.Bcl.Cryptography 8.0.0
44+
- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
45+
- Microsoft.Extensions.Caching.Memory 8.0.1
46+
- Microsoft.IdentityModel.JsonWebTokens 7.7.1
47+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
48+
- Microsoft.SqlServer.Server 1.0.0
49+
- System.Configuration.ConfigurationManager 8.0.1
50+
- System.Security.Cryptography.Pkcs 8.0.1
51+
- System.Text.Json 8.0.5
52+
53+
#### .NET 9.0
54+
55+
- Azure.Core 1.47.1
56+
- Azure.Identity 1.14.2
57+
- Microsoft.Bcl.Cryptography 9.0.4
58+
- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
59+
- Microsoft.Extensions.Caching.Memory 9.0.4
60+
- Microsoft.IdentityModel.JsonWebTokens 7.7.1
61+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
62+
- Microsoft.SqlServer.Server 1.0.0
63+
- System.Configuration.ConfigurationManager 9.0.4
64+
- System.Security.Cryptography.Pkcs 9.0.4
65+
- System.Text.Json 9.0.5
66+
67+
#### .NET Standard 2.0
68+
69+
- Azure.Core 1.47.1
70+
- Azure.Identity 1.14.2
71+
- Microsoft.Bcl.Cryptography 9.0.4
72+
- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
73+
- Microsoft.Extensions.Caching.Memory 9.0.4
74+
- Microsoft.IdentityModel.JsonWebTokens 7.7.1
75+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
76+
- Microsoft.SqlServer.Server 1.0.0
77+
- System.Configuration.ConfigurationManager 9.0.4
78+
- System.Security.Cryptography.Pkcs 9.0.4
79+
- System.Text.Json 9.0.5

‎release-notes/6.1/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 6.1 preview releases have been shipped:
44

55
| Release Date | Version | Notes |
66
| :-- | :-- | :--: |
7+
| 2025-08-14 | 6.1.1 | [Release Notes](6.1.1.md) |
78
| 2025-07-25 | 6.1.0 | [Release Notes](6.1.0.md) |
89
| 2025-06-27 | 6.1.0-preview2.25178.5 | [Release Notes](6.1.0-preview2.md) |
910
| 2025-04-30 | 6.1.0-preview1.25120.4 | [Release Notes](6.1.0-preview1.md) |

‎release-notes/README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ The latest stable release is [Microsoft.Data.SqlClient 6.0](6.0).
2020

2121
# Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider Release Notes
2222

23-
The latest stable release is [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 5.1](add-ons/AzureKeyVaultProvider/5.1).
23+
The latest stable release is
24+
[Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.1](add-ons/AzureKeyVaultProvider/6.1).
2425

2526
## Release Information
2627

28+
- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.1](add-ons/AzureKeyVaultProvider/6.1)
29+
- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.0](add-ons/AzureKeyVaultProvider/6.0)
2730
- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 5.1](add-ons/AzureKeyVaultProvider/5.1)
2831
- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 3.0](add-ons/AzureKeyVaultProvider/3.0)
2932
- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 2.0](add-ons/AzureKeyVaultProvider/2.0)

‎release-notes/add-ons/AzureKeyVaultProvider/6.0/6.0.0.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Release Notes
2+
3+
## 6.0.0 - 30 January 2025
4+
5+
### Changed
6+
7+
- Removed use of `System.Linq`.
8+
([#1949](https://github.com/dotnet/SqlClient/pull/1949))
9+
- Publish symbols packages with source link.
10+
([#2137](https://github.com/dotnet/SqlClient/pull/2137))
11+
- Signing package with strong name.
12+
([Commit `dbe09f1`](https://github.com/dotnet/SqlClient/commit/dbe09f1152f448ec7b6037579d9bcbf98b016fce))
13+
14+
## Target Platform Support
15+
16+
- .NET Framework 4.6.2+ (Windows ARM64, Windows x86, Windows x64)
17+
- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
18+
19+
## Dependencies
20+
21+
### .NET Framework
22+
23+
- Azure.Core 1.38.0
24+
- Azure.Security.KeyVault.Keys 4.5.0
25+
- Microsoft.Data.SqlClient 6.0.0
26+
- Microsoft.Extensions.Caching.Memory 6.0.1
27+
28+
### .NET 8.0
29+
30+
- Azure.Core 1.38.0
31+
- Azure.Security.KeyVault.Keys 4.5.0
32+
- Microsoft.Data.SqlClient 6.0.0
33+
- Microsoft.Extensions.Caching.Memory 8.0.1
34+
35+
### .NET 9.0
36+
37+
- Azure.Core 1.38.0
38+
- Azure.Security.KeyVault.Keys 4.5.0
39+
- Microsoft.Data.SqlClient 6.0.0
40+
- Microsoft.Extensions.Caching.Memory 9.0.0

‎release-notes/add-ons/AzureKeyVaultProvider/6.0/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.0 Releases
2+
3+
The following `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
4+
6.0 stable releases have been shipped:
5+
6+
| Release Date | Description | Notes |
7+
| :-- | :-- | :--: |
8+
| 2025/01/30 | 6.0.0 | [Release Notes](6.0.0.md) |

‎release-notes/add-ons/AzureKeyVaultProvider/6.1/6.1.0.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Release Notes
2+
3+
## 6.1.0 - 31 July 2025
4+
5+
### Changed
6+
7+
- Fixed AzureKeyVaultProvider package key caching to serialize Azure key fetch
8+
operations.
9+
([#3477](https://github.com/dotnet/SqlClient/pull/3477))
10+
- Marked AKV provider as trimmable and enabled AOT support.
11+
([#3401](https://github.com/dotnet/SqlClient/pull/3401))
12+
13+
## Target Platform Support
14+
15+
- .NET Framework 4.6.2+ (Windows ARM64, Windows x86, Windows x64)
16+
- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
17+
18+
## Dependencies
19+
20+
### .NET Framework
21+
22+
- Azure.Core 1.47.1
23+
- Azure.Security.KeyVault.Keys 4.7.0
24+
- Microsoft.Data.SqlClient 6.1.0
25+
- Microsoft.Extensions.Caching.Memory 8.0.1
26+
27+
### .NET 8.0
28+
29+
- Azure.Core 1.47.1
30+
- Azure.Security.KeyVault.Keys 4.7.0
31+
- Microsoft.Data.SqlClient 6.1.0
32+
- Microsoft.Extensions.Caching.Memory 8.0.1
33+
34+
### .NET 9.0
35+
36+
- Azure.Core 1.47.1
37+
- Azure.Security.KeyVault.Keys 4.7.0
38+
- Microsoft.Data.SqlClient 6.1.0
39+
- Microsoft.Extensions.Caching.Memory 9.0.4

0 commit comments

Comments
 (0)