Skip to content

Commit 54f8a1d

Browse files
MichelZMichelZ
committed
Merge main
2 parents 9290b06 + bb4c3b7 commit 54f8a1d

File tree

58 files changed

+3127
-2524
lines changed

Some content is hidden

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

58 files changed

+3127
-2524
lines changed

‎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: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,37 @@ 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+
## [Preview Release 6.0.0-preview3.24332.3] - 2024-11-27
10+
11+
This update brings the below changes over the previous release:
12+
13+
## Breaking Changes
14+
- Dropped support for .NET 6 [#2927](https://github.com/dotnet/SqlClient/pull/2927)
15+
- 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)
16+
17+
### Added
18+
- Enabled NuGet package auditing via NuGet.org audit source [#3024](https://github.com/dotnet/SqlClient/pull/3024)
19+
- Added support for .NET 9 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
20+
- 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)
21+
- Added dependency on Microsoft.Bcl.Cryptography:9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
22+
- Added missing SqlCommand_BeginExecuteReader code sample [#3009](https://github.com/dotnet/SqlClient/pull/3009)
23+
- Added support for SqlConnectionOverrides in OpenAsync() API [#2433](https://github.com/dotnet/SqlClient/pull/2433)
24+
- Added localization in Czech, Polish, and Turkish [#2987](https://github.com/dotnet/SqlClient/pull/2987)
25+
26+
### Fixed
27+
- Reverted default value of UseMinimumLoginTimeout context switch to 'true' [#2419](https://github.com/dotnet/SqlClient/pull/2419)
28+
- Added missing DynamicallyAccessedMembers attributes in .NET Runtime reference assemblies. [#2946](https://github.com/dotnet/SqlClient/pull/2946)
29+
- Synchronized dependencies of Reference Assemblies with Runtime assemblies [#2878](https://github.com/dotnet/SqlClient/pull/2878)
30+
- Fixed lazy initialization of the _SqlMetaData hidden column map for .NET Framework [#2964](https://github.com/dotnet/SqlClient/pull/2964)
31+
32+
### Changed
33+
- Updated Microsoft.Extensions.Caching.Memory to 9.0.0 for all frameworks [#2946](https://github.com/dotnet/SqlClient/pull/2946)
34+
- Updated System.Configuration.ConfigurationManager to 9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
35+
- Updated docs to use absolute links [#2949](https://github.com/dotnet/SqlClient/pull/2949)
36+
- Removed System.Text.Json dependency from .NET 8 [#2930](https://github.com/dotnet/SqlClient/pull/2930)
37+
738
## [Preview Release 6.0.0-preview2.24304.8] - 2024-10-30
839

940
This update brings the below changes over the previous release:

‎build.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<FunctionalTests Include="**/tools/TDS/TDS/TDS.csproj" />
6060
<FunctionalTests Include="**/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
6161
<FunctionalTests Include="**/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
62+
<FunctionalTests Include="**/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj"/>
6263
<FunctionalTests Include="**/tools/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj" />
6364
<FunctionalTests Include="**/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
6465
<FunctionalTests Include="**/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj" />

‎eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ steps:
3030
secureFile: netfxKeypair.snk
3131
retryCount: 5
3232

33+
- task: UseDotNet@2
34+
displayName: 'Use .NET 9.x sdk'
35+
inputs:
36+
packageType: sdk
37+
version: '9.x'
38+
39+
- task: UseDotNet@2
40+
displayName: 'Install .NET 8.x runtime'
41+
inputs:
42+
packageType: runtime
43+
version: '8.x'
44+
3345
- ${{ if eq(parameters.product, 'MDS') }}:
3446
- task: MSBuild@1
3547
displayName: 'BuildAllConfigurations using build.proj'

‎eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ steps:
7878
7979
Write-Host "Artifacts fetched for testing"
8080
Get-Location
81-
displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
81+
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
8282
8383
- ${{ if eq(parameters.product, 'AKV') }}:
8484
- powershell: |
@@ -95,7 +95,7 @@ steps:
9595
9696
Write-Host "Artifacts fetched for testing"
9797
Get-Location
98-
displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
98+
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
9999
100100
- powershell: |
101101
$software = '${{parameters.softwareFolder}}'

‎eng/pipelines/common/templates/steps/pre-build-step.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44
# See the LICENSE file in the project root for more information. #
55
#################################################################################
66
steps:
7+
- task: UseDotNet@2
8+
displayName: 'Use .NET 9.x sdk'
9+
inputs:
10+
packageType: sdk
11+
version: '9.x'
12+
13+
- task: UseDotNet@2
14+
displayName: 'Install .NET 8.x runtime'
15+
inputs:
16+
packageType: runtime
17+
version: '8.x'
18+
719
- script: SET
820
displayName: 'Print Environment Variables'
921

‎release-notes/6.0/6.0.0-preview3.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Release Notes
2+
3+
## [Preview Release 6.0.0-preview3.24332.3] - 2024-11-27
4+
5+
This update brings the below changes over the previous release:
6+
7+
### Contributors
8+
9+
Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
10+
11+
- [MichelZ](https://github.com/MichelZ)
12+
- [EamonHetherton](https://github.com/EamonHetherton)
13+
- [edwardneal](https://github.com/edwardneal)
14+
- [deadlydog](https://github.com/deadlydog)
15+
- [mus65](https://github.com/mus65)
16+
17+
## Breaking Changes
18+
- Dropped support for .NET 6 [#2927](https://github.com/dotnet/SqlClient/pull/2927)
19+
- 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)
20+
21+
### Added
22+
- Enabled NuGet package auditing via NuGet.org audit source [#3024](https://github.com/dotnet/SqlClient/pull/3024)
23+
- Added support for .NET 9 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
24+
- 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)
25+
- Added dependency on Microsoft.Bcl.Cryptography:9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
26+
- Added missing SqlCommand_BeginExecuteReader code sample [#3009](https://github.com/dotnet/SqlClient/pull/3009)
27+
- Added support for SqlConnectionOverrides in OpenAsync() API [#2433](https://github.com/dotnet/SqlClient/pull/2433)
28+
- Added localization in Czech, Polish, and Turkish [#2987](https://github.com/dotnet/SqlClient/pull/2987)
29+
30+
### Fixed
31+
- Reverted default value of UseMinimumLoginTimeout context switch to 'true' [#2419](https://github.com/dotnet/SqlClient/pull/2419)
32+
- Added missing DynamicallyAccessedMembers attributes in .NET Runtime reference assemblies. [#2946](https://github.com/dotnet/SqlClient/pull/2946)
33+
- Synchronized dependencies of Reference Assemblies with Runtime assemblies [#2878](https://github.com/dotnet/SqlClient/pull/2878)
34+
- Fixed lazy initialization of the _SqlMetaData hidden column map for .NET Framework [#2964](https://github.com/dotnet/SqlClient/pull/2964)
35+
36+
### Changed
37+
- Updated Microsoft.Extensions.Caching.Memory to 9.0.0 for all frameworks [#2946](https://github.com/dotnet/SqlClient/pull/2946)
38+
- Updated System.Configuration.ConfigurationManager to 9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
39+
- Updated docs to use absolute links [#2949](https://github.com/dotnet/SqlClient/pull/2949)
40+
- Removed System.Text.Json dependency from .NET 8 [#2930](https://github.com/dotnet/SqlClient/pull/2930)
41+
42+
## Target Platform Support
43+
- .NET Framework 4.6.2+ (Windows x86, Windows x64)
44+
- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
45+
46+
### Dependencies
47+
48+
#### .NET Framework
49+
50+
- Azure.Identity 1.11.4
51+
- Microsoft.Bcl.Cryptography 9.0.0
52+
- Microsoft.Data.SqlClient.SNI 6.0.0-preview1.24226.4
53+
- Microsoft.Extensions.Caching.Memory 9.0.0
54+
- Microsoft.IdentityModel.JsonWebTokens 7.5.0
55+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0
56+
- System.Buffers 4.5.1
57+
- System.Security.Cryptography.Pkcs 9.0.0
58+
- System.Text.Encodings.Web 6.0.0
59+
- System.Text.Json 6.0.10
60+
61+
#### .NET 8
62+
63+
- Azure.Identity 1.11.4
64+
- Microsoft.Bcl.Cryptography 9.0.0
65+
- Microsoft.Data.SqlClient.SNI.runtime 6.0.0-preview1.24226.4
66+
- Microsoft.Extensions.Caching.Memory 9.0.0
67+
- Microsoft.IdentityModel.JsonWebTokens 7.5.0
68+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0
69+
- Microsoft.SqlServer.Server 1.0.0
70+
- System.Configuration.ConfigurationManager 9.0.0
71+
- System.Security.Cryptography.Pkcs 9.0.0
72+
73+
#### .NET 9
74+
75+
- Azure.Identity 1.11.4
76+
- Microsoft.Bcl.Cryptography 9.0.0
77+
- Microsoft.Data.SqlClient.SNI.runtime 6.0.0-preview1.24226.4
78+
- Microsoft.Extensions.Caching.Memory 9.0.0
79+
- Microsoft.IdentityModel.JsonWebTokens 7.5.0
80+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0
81+
- Microsoft.SqlServer.Server 1.0.0
82+
- System.Configuration.ConfigurationManager 9.0.0
83+
- System.Security.Cryptography.Pkcs 9.0.0

‎release-notes/6.0/6.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ The following Microsoft.Data.SqlClient 6.0 preview releases have been shipped:
66
| :-- | :-- | :--: |
77
| 2024-08-27 | 6.0.0-preview1.24240.8 | [release notes](6.0.0-preview1.md) |
88
| 2024-10-30 | 6.0.0-preview2.24304.8 | [release notes](6.0.0-preview2.md) |
9+
| 2024-11-27 | 6.0.0-preview3.24332.3 | [release notes](6.0.0-preview3.md) |

‎release-notes/6.0/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ The following Microsoft.Data.SqlClient 6.0 preview releases have been shipped:
66
| :-- | :-- | :--: |
77
| 2024-08-27 | 6.0.0-preview1.24240.8 | [release notes](6.0.0-preview1.md) |
88
| 2024-10-30 | 6.0.0-preview2.24304.8 | [release notes](6.0.0-preview2.md) |
9+
| 2024-11-27 | 6.0.0-preview3.24332.3 | [release notes](6.0.0-preview3.md) |

‎src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
1818
<PropertyGroup>
1919
<TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net462</TargetNetFxVersion>
20-
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0</TargetNetCoreVersion>
20+
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0;net9.0</TargetNetCoreVersion>
2121
</PropertyGroup>
2222

2323
<ItemGroup>
@@ -34,7 +34,7 @@
3434
<!-- Set Target Framework when TestTargetOS is not empty. (Command Line) -->
3535
<Otherwise>
3636
<PropertyGroup>
37-
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">net8.0</TargetFrameworks>
37+
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">net8.0;net9.0</TargetFrameworks>
3838
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net462</TargetFrameworks>
3939
</PropertyGroup>
4040
</Otherwise>

0 commit comments

Comments
 (0)