Skip to content

Commit 669cc6a

Browse files
committed
Merge remote-tracking branch 'origin/main' into sspi-writer
2 parents 4def406 + 081fc51 commit 669cc6a

File tree

216 files changed

+7254
-7090
lines changed

Some content is hidden

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

216 files changed

+7254
-7090
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: 'Triage Needed'
6-
assignees: ''
4+
title: ""
5+
labels: [":new: Triage Needed", ":bug: Bug!"]
6+
assignees: []
77

88
---
99

@@ -31,9 +31,9 @@ A clear and concise description of what you expected to happen.
3131

3232
### Further technical details
3333
Microsoft.Data.SqlClient version: (found on the nuget or Microsoft.Data.SqlClient.dll)
34-
.NET target: (e.g. Framework 4.7.1, Core 2.2.2)
35-
SQL Server version: (e.g. SQL Server 2017)
36-
Operating system: (e.g. Windows 2019, Ubuntu 18.04, macOS 10.13, Docker container)
34+
.NET target: (e.g. .NET Framework 4.7.2, .NET 6.0)
35+
SQL Server version: (e.g. SQL Server 2022)
36+
Operating system: (e.g. Windows Server 2022, Ubuntu 24.04, macOS 14.7.1, Docker container)
3737

3838
**Additional context**
39-
Add any other context about the problem here.
39+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: SqlClient Community Support / Discussions
4+
url: https://github.com/dotnet/SqlClient/discussions
5+
about: Please ask and answer questions here.
6+
- name: MSRC Vulnerability Reporting / Bug Bounty
7+
url: https://msrc.microsoft.com/create-report
8+
about: Please report security vulnerabilities here.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
5-
labels: 'Triage Needed'
6-
assignees: ''
4+
title: ""
5+
labels: [":new: Triage Needed", ":bulb: Enhancement"]
6+
assignees: []
77

88
---
99

@@ -17,4 +17,4 @@ A clear and concise description of what you want to happen.
1717
A clear and concise description of any alternative solutions or features you've considered.
1818

1919
### Additional context
20-
Add any other context about the feature request here.
20+
Add any other context about the feature request here.

.github/ISSUE_TEMPLATE/other.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
---
22
name: Other
33
about: Ask a question or file a different type of issue
4-
title: ''
5-
labels: 'Triage Needed'
6-
assignees: ''
7-
8-
---
9-
4+
title: ""
5+
labels: [":new: Triage Needed"]
6+
assignees: []
107

8+
---

BUILDGUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ To run the same:
306306
The program 'dotnet' has exited with code 0 (0x0).
307307
```
308308
309-
5. Now you can write code in [Program.cs](/src/Microsoft.Data.SqlClient/tests/DockerLinuxTest/Program.cs) to debug SqlClient on Linux!
309+
5. Now you can write code in [Program.cs](/src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Program.cs) to debug SqlClient on Linux!
310310
311311
### Troubleshooting Docker issues
312312

CHANGELOG.md

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,55 @@ 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
8+
9+
## [Stable release 6.0.1] - 2025-01-23
10+
11+
This update brings the below changes over the previous release:
12+
13+
### Fixed
14+
15+
- Fixed reference assembly definitions for SqlClientDiagnostic APIs [#3097](https://github.com/dotnet/SqlClient/pull/3097)
16+
- Fixed issue with down-level SSL/TLS version warnings [#3126](https://github.com/dotnet/SqlClient/pull/3126)
17+
18+
### Changed
19+
20+
- Dependency changes
21+
- Updated SNI dependency `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` to `6.0.2` [#3116](https://github.com/dotnet/SqlClient/pull/3116) [#3117](https://github.com/dotnet/SqlClient/pull/3117)
22+
23+
## [Stable release 6.0.0] - 2024-12-09
24+
25+
_No changes since the last preview release_
26+
27+
## [Preview Release 6.0.0-preview3.24332.3] - 2024-11-27
28+
29+
This update brings the below changes over the previous release:
30+
31+
### Breaking Changes
32+
- Dropped support for .NET 6 [#2927](https://github.com/dotnet/SqlClient/pull/2927)
33+
- Removed SQL 2000 client-side debugging support for .NET Framework [#2981](https://github.com/dotnet/SqlClient/pull/2981), [#2940](https://github.com/dotnet/SqlClient/pull/2940)
34+
35+
### Added
36+
- Enabled NuGet package auditing via NuGet.org audit source [#3024](https://github.com/dotnet/SqlClient/pull/3024)
37+
- Added support for .NET 9 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
38+
- Added dependency on System.Security.Cryptography.Pkcs:9.0.0 to address [SYSLIB0057](https://learn.microsoft.com/en-us/dotnet/fundamentals/syslib-diagnostics/syslib0057)[#2946](https://github.com/dotnet/SqlClient/pull/2946)
39+
- Added dependency on Microsoft.Bcl.Cryptography:9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
40+
- Added missing SqlCommand_BeginExecuteReader code sample [#3009](https://github.com/dotnet/SqlClient/pull/3009)
41+
- Added support for SqlConnectionOverrides in OpenAsync() API [#2433](https://github.com/dotnet/SqlClient/pull/2433)
42+
- Added localization in Czech, Polish, and Turkish [#2987](https://github.com/dotnet/SqlClient/pull/2987)
43+
44+
### Fixed
45+
- Reverted default value of UseMinimumLoginTimeout context switch to 'true' [#2419](https://github.com/dotnet/SqlClient/pull/2419)
46+
- Added missing DynamicallyAccessedMembers attributes in .NET Runtime reference assemblies. [#2946](https://github.com/dotnet/SqlClient/pull/2946)
47+
- Synchronized dependencies of Reference Assemblies with Runtime assemblies [#2878](https://github.com/dotnet/SqlClient/pull/2878)
48+
- Fixed lazy initialization of the _SqlMetaData hidden column map for .NET Framework [#2964](https://github.com/dotnet/SqlClient/pull/2964)
49+
50+
### Changed
51+
- Updated Microsoft.Extensions.Caching.Memory to 9.0.0 for all frameworks [#2946](https://github.com/dotnet/SqlClient/pull/2946)
52+
- Updated System.Configuration.ConfigurationManager to 9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
53+
- Updated docs to use absolute links [#2949](https://github.com/dotnet/SqlClient/pull/2949)
54+
- Removed System.Text.Json dependency from .NET 8 [#2930](https://github.com/dotnet/SqlClient/pull/2930)
55+
756
## [Preview Release 6.0.0-preview2.24304.8] - 2024-10-30
857

958
This update brings the below changes over the previous release:
@@ -42,7 +91,7 @@ This update brings the below changes over the previous release:
4291
### Added
4392

4493
- Added `TokenCredential` object to take advantage of token caching in `ActiveDirectoryAuthenticationProvider`. [#2380](https://github.com/dotnet/SqlClient/pull/2380)
45-
- Added `DateOnly` and `TimeOnly` support to `DataTable` as a structured parameter. [#2258](https://github.com/dotnet/SqlClient/pull/2258)
94+
- Added support for using `DateOnly` and `TimeOnly` in `DataTable` and `SqlDataRecord` structured parameters. [#2258](https://github.com/dotnet/SqlClient/pull/2258)
4695
- Added `Microsoft.Data.SqlClient.Diagnostics.SqlClientDiagnostic` type in .NET. [#2226](https://github.com/dotnet/SqlClient/pull/2226)
4796
- Added scope trace for `GenerateSspiClientContext`. [#2497](https://github.com/dotnet/SqlClient/pull/2497), [#2725](https://github.com/dotnet/SqlClient/pull/2725)
4897

@@ -58,7 +107,7 @@ This update brings the below changes over the previous release:
58107
- Fixed clone of `SqlConnection` to include `AccessTokenCallback`. [#2525](https://github.com/dotnet/SqlClient/pull/2525)
59108
- Fixed issue with `DateTimeOffset` in table-valued parameters, which was introduced in 5.2. [#2453](https://github.com/dotnet/SqlClient/pull/2453)
60109
- Fixed `ArgumentNullException` on `SqlDataRecord.GetValue` when using user-defined data type on .NET. [#2448](https://github.com/dotnet/SqlClient/pull/2448)
61-
- Fixed `SqlBuffer` and `SqlGuild` when it's null. [#2310](https://github.com/dotnet/SqlClient/pull/2310)
110+
- Fixed `SqlBuffer` and `SqlGuid` when it's null. [#2310](https://github.com/dotnet/SqlClient/pull/2310)
62111
- Fixed `SqlBulkCopy.WriteToServer` state in a consecutive calls. [#2375](https://github.com/dotnet/SqlClient/pull/2375)
63112
- Fixed null reference exception with `SqlConnection.FireInfoMessageEventOnUserErrors` after introducing the batch command. [#2399](https://github.com/dotnet/SqlClient/pull/2399)
64113

CONTRIBUTING.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ General contribution guidance is included in this document. Additional guidance
77

88
## Up for Grabs
99

10-
The team marks the most straightforward issues as "up for grabs". This set of issues is the place to start if you are interested in contributing but new to the codebase.
10+
The team marks the most straightforward issues as "up for grabs" and issues that are well suited to get you started as "Good first issue". This set of issues is the place to start if you are interested in contributing but new to the codebase.
1111

12-
- [dotnet/sqlclient - "up for grabs"](https://github.com/dotnet/sqlclient/labels/Up-for-Grabs)
12+
- [dotnet/sqlclient - :raised_hands: Up-for-Grabs](https://github.com/dotnet/sqlclient/labels/%3Araised_hands%3A%20Up-for-Grabs)
13+
- [dotnet/sqlclient - :sparkles: Good first issue](https://github.com/dotnet/sqlclient/labels/%3Asparkles%3A%20Good%20first%20issue)
1314

1415
## Contribution "Bar"
1516

16-
Project maintainers will merge changes that improve the product significantly and broadly and that align with the [Microsoft.Data.SqlClient roadmap](https://github.com/dotnet/sqlclient/blob/master/roadmap.md).
17+
Project maintainers will merge changes that improve the product significantly and broadly and that align with the [Microsoft.Data.SqlClient roadmap](roadmap.md).
1718

1819
Contributions must also satisfy the other published guidelines defined in this document.
1920

@@ -42,19 +43,21 @@ Please do not:
4243

4344
## Using Labels
4445

45-
We encourage adding appropriate labels to issues and pull requests to allow filtering and analysis effectively. The below variables are required for new Pull Requests if applicable:
46+
As adding labels [is not possible](https://stackoverflow.com/questions/13829466/how-to-put-a-label-on-an-issue-in-github-if-you-are-not-a-contributor-owner/13829505#13829505) for contributors, please comment in the issue and pull request on what labels should be added.
47+
The below variables are required for new Pull Requests if applicable:
4648

4749
| Label | Description |
4850
| ----- | ----------- |
49-
| [Public API](https://github.com/dotnet/SqlClient/labels/Public%20API) | Use this variable if a new Public API is added to the Pull Request.
50-
| [Breaking Change](https://github.com/dotnet/SqlClient/labels/Breaking%20Change) | Use this variable if the Pull Request breaks an existing API. |
51-
| [Backport to CoreFx](https://github.com/dotnet/SqlClient/labels/Backport%20to%20CoreFx) | Use this variable if the Issue/Pull Request needs to be backported to System.Data.SqlClient in [dotnet/corefx](https://github.com/dotnet/corefx) |
52-
| [Managed SNI](https://github.com/dotnet/SqlClient/labels/Managed%20SNI) | Use this label if the issue/PR relates to issues in Managed SNI |
53-
| [Tests](https://github.com/dotnet/SqlClient/labels/Tests) | Use this label for pull requests that add only tests to the repository. |
51+
| [:new: Public API](https://github.com/dotnet/SqlClient/labels/%3Anew%3A%20Public%20API) | Use this variable if a new Public API is added to the Pull Request.
52+
| [:hammer: Breaking Change](https://github.com/dotnet/SqlClient/labels/%3Ahammer%3A%20Breaking%20Change) | Use this variable if the Pull Request breaks an existing API. |
53+
| [Area\Managed SNI](https://github.com/dotnet/SqlClient/labels/Area%5cManaged%20SNI) | Use this label if the issue/PR relates to issues in Managed SNI |
54+
| [Area\Tests](https://github.com/dotnet/SqlClient/labels/Area%5cTests) | Use this label for pull requests that add only tests to the repository. |
55+
56+
You can find all possible labels [here](https://github.com/dotnet/SqlClient/labels)
5457

5558
## Reporting security issues and security bugs
5659

57-
Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) [secure@microsoft.com](mailto:secure@microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094.aspx).
60+
Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) [secure@microsoft.com](mailto:secure@microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [MSRC FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue?rtc=1&oneroute=true).
5861

5962
## File Headers
6063

@@ -70,7 +73,7 @@ The following file header is used for Microsoft.Data.SqlClient. Please use it fo
7073

7174
You must sign a [.NET Foundation Contribution License Agreement (CLA)](https://cla.dotnetfoundation.org) before your PR will be merged. This is a one-time requirement for projects in the .NET Foundation. You can read more about [Contribution License Agreements (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) on Wikipedia.
7275

73-
The agreement: [net-foundation-contribution-license-agreement.pdf](https://github.com/dotnet/home/blob/master/guidance/net-foundation-contribution-license-agreement.pdf)
76+
The agreement: [contribution-license-agreement.pdf](https://cla.dotnetfoundation.org)
7477

7578
You don't have to do this up-front. You can simply clone, fork, and submit your pull-request as usual. When your pull-request is created, it is classified by a CLA bot. If the change is trivial (for example, you just fixed a typo), then the PR is labelled with `cla-not-required`. Otherwise it's classified as `cla-required`. Once you signed a CLA, the current and all future pull-requests will be labelled as `cla-signed`.
7679

COPYRIGHT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
## Binary License
88

9-
- **Microsoft.Data.SqlClient** binary distributions (nuget packages) are licensed as MIT (identical to the [Microsoft.Data.SqlClient source license](https://github.com/dotnet/sqlclient/blob/master/LICENSE)).
9+
- **Microsoft.Data.SqlClient** binary distributions (NuGet packages) are licensed as MIT (identical to the [Microsoft.Data.SqlClient source license](LICENSE)).

NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@
44
<clear />
55
<add key="sqlclient" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
66
</packageSources>
7+
<auditSources>
8+
<clear />
9+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
10+
</auditSources>
711
</configuration>

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/dotnet/sqlclient/master/LICENSE)
1+
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](LICENSE)
22
[![Nuget](https://img.shields.io/nuget/dt/Microsoft.Data.SqlClient?label=Nuget.org%20Downloads&style=flat-square&color=blue)](https://www.nuget.org/packages/Microsoft.Data.SqlClient)
33
[![Build status](https://sqlclientdrivers.visualstudio.com/public/_apis/build/status/ADO/CI-SqlClient)](https://sqlclientdrivers.visualstudio.com/public/_build/latest?definitionId=1879)
44

@@ -11,7 +11,7 @@ Microsoft.Data.SqlClient is a .NET data provider for [Microsoft SQL Server]([url
1111
The Microsoft.Data.SqlClient package supports the following environments:
1212

1313
- .NET Framework 4.6.2+
14-
- .NET 8.0
14+
- .NET 8.0+
1515

1616
## Download
1717

@@ -40,15 +40,17 @@ When targeting .NET on Windows, a package reference to [Microsoft.Data.SqlClient
4040
Special thanks to everyone who has contributed to the project.
4141
We thank you for your continuous support in improving the SqlClient library!
4242

43-
- Wraith ([@Wraith2](https://github.com/Wraith2))
43+
- Edward Neal ([@edwardneal](https://github.com/edwardneal))
4444
- Erik Ejlskov Jensen ([@ErikEJ](https://github.com/ErikEJ))
45-
- Simon Cropp ([@SimonCropp](https://github.com/SimonCropp))
46-
- Stefán Jökull Sigurðarson ([@stebet](https://github.com/stebet))
45+
- Michel Zehnder ([@MichelZ](https://github.com/MichelZ))
4746
- Shay Rojansky ([@roji](https://github.com/roji))
48-
- Stephen Toub ([@stephentoub](https://github.com/stephentoub))
49-
- Rasmus Melchior Jacobsen ([@rmja](https://github.com/rmja))
5047
- Phillip Haydon ([@phillip-haydon](https://github.com/phillip-haydon))
48+
- Rasmus Melchior Jacobsen ([@rmja](https://github.com/rmja))
5149
- Robin Sue ([@Suchiman](https://github.com/Suchiman))
50+
- Simon Cropp ([@SimonCropp](https://github.com/SimonCropp))
51+
- Stefán Jökull Sigurðarson ([@stebet](https://github.com/stebet))
52+
- Stephen Toub ([@stephentoub](https://github.com/stephentoub))
53+
- Wraith ([@Wraith2](https://github.com/Wraith2))
5254

5355
Up-to-date list of contributors: [Contributor Insights](https://github.com/dotnet/SqlClient/graphs/contributors)
5456

@@ -108,7 +110,7 @@ Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https:
108110

109111
## License
110112

111-
The Microsoft.Data.SqlClient Driver for SQL Server is licensed under the MIT license. See the [LICENSE](https://github.com/dotnet/SqlClient/blob/master/LICENSE) file for more details.
113+
The Microsoft.Data.SqlClient Driver for SQL Server is licensed under the MIT license. See the [LICENSE](LICENSE) file for more details.
112114

113115
## Trademarks
114116

0 commit comments

Comments
 (0)