Merge main

BUILDGUIDE.md

@@ -306,7 +306,7 @@ To run the same:
     The program 'dotnet' has exited with code 0 (0x0).
     ```
 
-5. Now you can write code in [Program.cs](/src/Microsoft.Data.SqlClient/tests/DockerLinuxTest/Program.cs) to debug SqlClient on Linux!
+5. Now you can write code in [Program.cs](/src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Program.cs) to debug SqlClient on Linux!
 
 ### Troubleshooting Docker issues
 

CHANGELOG.md

@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+# Release Notes
+
+## [Preview Release 6.0.0-preview3.24332.3] - 2024-11-27
+
+This update brings the below changes over the previous release:
+
+## Breaking Changes
+- Dropped support for .NET 6 [#2927](https://github.com/dotnet/SqlClient/pull/2927)
+- 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)
+
+### Added
+- Enabled NuGet package auditing via NuGet.org audit source [#3024](https://github.com/dotnet/SqlClient/pull/3024)
+- Added support for .NET 9 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- 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)
+- Added dependency on Microsoft.Bcl.Cryptography:9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Added missing SqlCommand_BeginExecuteReader code sample [#3009](https://github.com/dotnet/SqlClient/pull/3009)
+- Added support for SqlConnectionOverrides in OpenAsync() API [#2433](https://github.com/dotnet/SqlClient/pull/2433)
+- Added localization in Czech, Polish, and Turkish [#2987](https://github.com/dotnet/SqlClient/pull/2987)
+
+### Fixed
+- Reverted default value of UseMinimumLoginTimeout context switch to 'true' [#2419](https://github.com/dotnet/SqlClient/pull/2419)
+- Added missing DynamicallyAccessedMembers attributes in .NET Runtime reference assemblies. [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Synchronized dependencies of Reference Assemblies with Runtime assemblies [#2878](https://github.com/dotnet/SqlClient/pull/2878)
+- Fixed lazy initialization of the _SqlMetaData hidden column map for .NET Framework [#2964](https://github.com/dotnet/SqlClient/pull/2964)
+
+### Changed
+- Updated Microsoft.Extensions.Caching.Memory to 9.0.0 for all frameworks [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Updated System.Configuration.ConfigurationManager to 9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Updated docs to use absolute links [#2949](https://github.com/dotnet/SqlClient/pull/2949)
+- Removed System.Text.Json dependency from .NET 8 [#2930](https://github.com/dotnet/SqlClient/pull/2930)
+
 ## [Preview Release 6.0.0-preview2.24304.8] - 2024-10-30
 
 This update brings the below changes over the previous release:

build.proj

@@ -59,6 +59,7 @@
     <FunctionalTests Include="**/tools/TDS/TDS/TDS.csproj" />
     <FunctionalTests Include="**/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
     <FunctionalTests Include="**/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+    <FunctionalTests Include="**/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj"/>
     <FunctionalTests Include="**/tools/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj" />
     <FunctionalTests Include="**/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
     <FunctionalTests Include="**/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj" />

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

@@ -30,6 +30,18 @@ steps:
     secureFile: netfxKeypair.snk
     retryCount: 5
 
+- task: UseDotNet@2
+  displayName: 'Use .NET 9.x sdk'
+  inputs:
+    packageType: sdk
+    version: '9.x'
+
+- task: UseDotNet@2
+  displayName: 'Install .NET 8.x runtime'
+  inputs:
+    packageType: runtime
+    version: '8.x'
+
 - ${{ if eq(parameters.product, 'MDS') }}:
   - task: MSBuild@1
     displayName: 'BuildAllConfigurations using build.proj'

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

@@ -78,7 +78,7 @@ steps:
             
         Write-Host "Artifacts fetched for testing"
         Get-Location
-      displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
+      displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
 
   - ${{ if eq(parameters.product, 'AKV') }}:
     - powershell: |
@@ -95,7 +95,7 @@ steps:
             
         Write-Host "Artifacts fetched for testing"
         Get-Location
-      displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
+      displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
 
 - powershell: |
     $software = '${{parameters.softwareFolder}}'

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

@@ -4,6 +4,18 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET 9.x sdk'
+  inputs:
+    packageType: sdk
+    version: '9.x'
+
+- task: UseDotNet@2
+  displayName: 'Install .NET 8.x runtime'
+  inputs:
+    packageType: runtime
+    version: '8.x'
+
 - script: SET
   displayName: 'Print Environment Variables'
 

release-notes/6.0/6.0.0-preview3.md

@@ -0,0 +1,83 @@
+# Release Notes
+
+## [Preview Release 6.0.0-preview3.24332.3] - 2024-11-27
+
+This update brings the below changes over the previous release:
+
+### Contributors
+
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+
+- [MichelZ](https://github.com/MichelZ)
+- [EamonHetherton](https://github.com/EamonHetherton)
+- [edwardneal](https://github.com/edwardneal)
+- [deadlydog](https://github.com/deadlydog)
+- [mus65](https://github.com/mus65)
+
+## Breaking Changes
+- Dropped support for .NET 6 [#2927](https://github.com/dotnet/SqlClient/pull/2927)
+- 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)
+
+### Added
+- Enabled NuGet package auditing via NuGet.org audit source [#3024](https://github.com/dotnet/SqlClient/pull/3024)
+- Added support for .NET 9 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- 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)
+- Added dependency on Microsoft.Bcl.Cryptography:9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Added missing SqlCommand_BeginExecuteReader code sample [#3009](https://github.com/dotnet/SqlClient/pull/3009)
+- Added support for SqlConnectionOverrides in OpenAsync() API [#2433](https://github.com/dotnet/SqlClient/pull/2433)
+- Added localization in Czech, Polish, and Turkish [#2987](https://github.com/dotnet/SqlClient/pull/2987)
+
+### Fixed
+- Reverted default value of UseMinimumLoginTimeout context switch to 'true' [#2419](https://github.com/dotnet/SqlClient/pull/2419)
+- Added missing DynamicallyAccessedMembers attributes in .NET Runtime reference assemblies. [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Synchronized dependencies of Reference Assemblies with Runtime assemblies [#2878](https://github.com/dotnet/SqlClient/pull/2878)
+- Fixed lazy initialization of the _SqlMetaData hidden column map for .NET Framework [#2964](https://github.com/dotnet/SqlClient/pull/2964)
+
+### Changed
+- Updated Microsoft.Extensions.Caching.Memory to 9.0.0 for all frameworks [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Updated System.Configuration.ConfigurationManager to 9.0.0 [#2946](https://github.com/dotnet/SqlClient/pull/2946)
+- Updated docs to use absolute links [#2949](https://github.com/dotnet/SqlClient/pull/2949)
+- Removed System.Text.Json dependency from .NET 8 [#2930](https://github.com/dotnet/SqlClient/pull/2930)
+
+## Target Platform Support
+- .NET Framework 4.6.2+ (Windows x86, Windows x64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
+
+### Dependencies
+
+#### .NET Framework
+
+- Azure.Identity 1.11.4
+- Microsoft.Bcl.Cryptography 9.0.0
+- Microsoft.Data.SqlClient.SNI 6.0.0-preview1.24226.4
+- Microsoft.Extensions.Caching.Memory 9.0.0
+- Microsoft.IdentityModel.JsonWebTokens 7.5.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0
+- System.Buffers 4.5.1
+- System.Security.Cryptography.Pkcs 9.0.0
+- System.Text.Encodings.Web 6.0.0
+- System.Text.Json 6.0.10
+
+#### .NET 8
+
+- Azure.Identity 1.11.4
+- Microsoft.Bcl.Cryptography 9.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.0-preview1.24226.4
+- Microsoft.Extensions.Caching.Memory 9.0.0
+- Microsoft.IdentityModel.JsonWebTokens 7.5.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.0
+- System.Security.Cryptography.Pkcs 9.0.0
+
+#### .NET 9
+
+- Azure.Identity 1.11.4
+- Microsoft.Bcl.Cryptography 9.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.0-preview1.24226.4
+- Microsoft.Extensions.Caching.Memory 9.0.0
+- Microsoft.IdentityModel.JsonWebTokens 7.5.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.0
+- System.Security.Cryptography.Pkcs 9.0.0

release-notes/6.0/6.0.md

@@ -6,3 +6,4 @@ The following Microsoft.Data.SqlClient 6.0 preview releases have been shipped:
 | :-- | :-- | :--: |
 | 2024-08-27 | 6.0.0-preview1.24240.8 | [release notes](6.0.0-preview1.md) |
 | 2024-10-30 | 6.0.0-preview2.24304.8 | [release notes](6.0.0-preview2.md) |
+| 2024-11-27 | 6.0.0-preview3.24332.3 | [release notes](6.0.0-preview3.md) |

release-notes/6.0/README.md

@@ -6,3 +6,4 @@ The following Microsoft.Data.SqlClient 6.0 preview releases have been shipped:
 | :-- | :-- | :--: |
 | 2024-08-27 | 6.0.0-preview1.24240.8 | [release notes](6.0.0-preview1.md) |
 | 2024-10-30 | 6.0.0-preview2.24304.8 | [release notes](6.0.0-preview2.md) |
+| 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

@@ -17,7 +17,7 @@
   <!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
   <PropertyGroup>
     <TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net462</TargetNetFxVersion>
-    <TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0</TargetNetCoreVersion>
+    <TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0;net9.0</TargetNetCoreVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,7 +34,7 @@
     <!-- Set Target Framework when TestTargetOS is not empty. (Command Line) -->
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">net8.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">net8.0;net9.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net462</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

@@ -34,5 +34,7 @@
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
+    <PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
   </ItemGroup>
 </Project>