Merge branch 'main' into issues/sqlbulkcopy-hidden-columns

Author: edwardneal

.editorconfig

@@ -46,6 +46,9 @@ csharp_style_var_for_built_in_types = false:none
 csharp_style_var_when_type_is_apparent = false:none
 csharp_style_var_elsewhere = false:suggestion
 
+# don't prefer the range operator, netfx doesn't have these types
+csharp_style_prefer_range_operator = false
+
 # use language keywords instead of BCL types
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
@@ -155,23 +158,13 @@ dotnet_code_quality.CA2100.excluded_type_names_with_derived_types = Microsoft.Da
 dotnet_diagnostic.xUnit1031.severity=none
 dotnet_diagnostic.xUnit1030.severity=none
 
-[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
-indent_size = 2
-
-# Xml build files
-[*.builds]
-indent_size = 2
-
 # Xml files
-[*.{xml,stylecop,resx,ruleset}]
-indent_size = 2
-
-# Xml config files
-[*.{props,targets,config,nuspec}]
+[*.{xml,csproj,stylecop,resx,ruleset,props,targets,config,nuspec}]
 indent_size = 2
 
 # Shell scripts
 [*.sh]
 end_of_line = lf
+
 [*.{cmd, bat}]
 end_of_line = crlf

CHANGELOG.md

@@ -4,6 +4,68 @@ 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/)
 
+## [Preview Release 7.0.0-preview1.25257.1] - 2025-09-12
+
+This update brings the following changes since the [6.1.0](release-notes/6.1/6.1.0.md)
+release:
+
+### Breaking Changes
+
+- Removed `Constrained Execution Region` error handling blocks and associated
+  `SqlConnection` cleanup which may affect how potentially-broken connections
+  are expunged from the pool.
+  ([#3535](https://github.com/dotnet/SqlClient/pull/3535))
+
+### Bug Fixes
+
+- Packet multiplexing disabled by default, and several bug fixes.
+  ([#3534](https://github.com/dotnet/SqlClient/pull/3534),
+   [#3537](https://github.com/dotnet/SqlClient/pull/3537))
+
+### Added
+
+- `SqlColumnEncryptionCertificateStoreProvider` now works on Windows, Linux,
+  and macOS.
+  ([#3014](https://github.com/dotnet/SqlClient/pull/3014))
+
+### Changed
+
+- Updated `SqlVector.Null` to return a nullable `SqlVector` instance in the
+  reference API to match the implementation.
+  ([#3521](https://github.com/dotnet/SqlClient/pull/3521))
+
+- Performance improvements for all built-in
+  `SqlColumnEncryptionKeyStoreProvider` implementations.
+  ([#3554](https://github.com/dotnet/SqlClient/pull/3554))
+
+- Various test improvements.
+  ([#3456](https://github.com/dotnet/SqlClient/pull/3456),
+   [#2968](https://github.com/dotnet/SqlClient/pull/2968),
+   [#3458](https://github.com/dotnet/SqlClient/pull/3458),
+   [#3494](https://github.com/dotnet/SqlClient/pull/3494),
+   [#3559](https://github.com/dotnet/SqlClient/pull/3559),
+   [#3575](https://github.com/dotnet/SqlClient/pull/3575))
+
+- Codebase merge project and related cleanup.
+  ([#3436](https://github.com/dotnet/SqlClient/pull/3436),
+   [#3434](https://github.com/dotnet/SqlClient/pull/3434),
+   [#3448](https://github.com/dotnet/SqlClient/pull/3448),
+   [#3454](https://github.com/dotnet/SqlClient/pull/3454),
+   [#3462](https://github.com/dotnet/SqlClient/pull/3462),
+   [#3435](https://github.com/dotnet/SqlClient/pull/3435),
+   [#3492](https://github.com/dotnet/SqlClient/pull/3492),
+   [#3473](https://github.com/dotnet/SqlClient/pull/3473),
+   [#3469](https://github.com/dotnet/SqlClient/pull/3469),
+   [#3394](https://github.com/dotnet/SqlClient/pull/3394),
+   [#3493](https://github.com/dotnet/SqlClient/pull/3493),
+   [#3593](https://github.com/dotnet/SqlClient/pull/3593))
+
+- Documentation improvements.
+  ([#3490](https://github.com/dotnet/SqlClient/pull/3490))
+
+- Updated `Azure.Identity` dependency to v1.14.2.
+  ([#3538](https://github.com/dotnet/SqlClient/pull/3538))
+
 ## [Stable Release 6.1.1] - 2025-08-14
 
 This update includes the following changes since the [6.1.0](6.1.0.md) release:

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

@@ -73,9 +73,18 @@ parameters:
       - Project
       - Package
 
+  # The timeout, in minutes, for this job.
+  - name: timeout
+    type: string
+    default: 90
+
 jobs:
 - job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
 
+  # Some of our tests take longer than the default 60 minutes to run on some
+  # OSes and configurations.
+  timeoutInMinutes: ${{ parameters.timeout }}
+
   pool:
     name: '${{ parameters.poolName }}'
     ${{ if eq(parameters.hostedPool, true) }}:

eng/pipelines/common/templates/jobs/run-tests-package-reference-job.yml

@@ -20,11 +20,21 @@ parameters:
   - name: isPreview
     type: boolean
 
+  # The timeout, in minutes, for this job.
+  - name: timeout
+    type: string
+    default: 90
+
 jobs:
 - job: run_tests_package_reference
   displayName: 'Run tests with package reference'
   ${{ if ne(parameters.dependsOn, 'empty')}}:
     dependsOn: '${{parameters.dependsOn }}'
+
+  # Some of our tests take longer than the default 60 minutes to run on some
+  # OSes and configurations.
+  timeoutInMinutes: ${{ parameters.timeout }}
+
   pool:
     type: windows  # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
     isCustom: true

eng/pipelines/common/templates/stages/ci-run-tests-stage.yml

@@ -30,6 +30,11 @@ parameters:
     type: jobList
     default: []
 
+  # The timeout, in minutes, for each test job.
+  - name: testsTimeout
+    type: string
+    default: 90
+
 stages:
 - ${{ each config in parameters.testConfigurations }}:
   - ${{ each image in config.value.images }}:
@@ -47,6 +52,7 @@ stages:
                 parameters:
                   debug: ${{ parameters.debug }}
                   buildType: ${{ parameters.buildType }}
+                  timeout: ${{ parameters.testsTimeout }}
                   poolName: ${{ config.value.pool }}
                   hostedPool: ${{ eq(config.value.hostedPool, true) }}
                   image: ${{ image.value }}
@@ -72,6 +78,7 @@ stages:
                   parameters:
                     debug: ${{ parameters.debug }}
                     buildType: ${{ parameters.buildType }}
+                    timeout: ${{ parameters.testsTimeout }}
                     poolName: ${{ config.value.pool }}
                     hostedPool: ${{ eq(config.value.hostedPool, true) }}
                     image: ${{ image.value }}

eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml

@@ -34,37 +34,63 @@ steps:
     docker pull mcr.microsoft.com/mssql/server:2022-latest
     
     # Password for the SA user (required)
-    MSSQL_SA_PW=${{parameters.password }}
+    MSSQL_SA_PW=${{ parameters.password }}
 
     docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2022-latest
  
     sleep 5
 
     docker ps -a
 
-    # Connect to server and get the version:
-    counter=1
-    errstatus=1
-    while [ $counter -le 20 ] && [ $errstatus = 1 ]
+    # Connect to the SQL Server container and get its version.
+    #
+    # It can take a while for the docker container to start listening and be
+    # ready for connections, so we will wait for up to 2 minutes, checking every
+    # 3 seconds.
+
+    # Wait 3 seconds between attempts.
+    delay=3
+    
+    # Try up to 40 times (2 minutes) to connect.
+    maxAttempts=40
+    
+    # Attempt counter.
+    attempt=1
+
+    # Flag to indicate when SQL Server is ready to accept connections.
+    ready=0
+
+    while [ $attempt -le $maxAttempts ]
     do
-      echo Waiting for SQL Server to start...
-      sleep 3
-      sqlcmd -S 0.0.0.0 -No -U sa -P $MSSQL_SA_PW -Q "SELECT @@VERSION" 2>$SQLCMD_ERRORS
-      errstatus=$?
-      ((counter++))
+      echo "Waiting for SQL Server to start (attempt #$attempt of $maxAttempts)..."
+    
+      sqlcmd -S 127.0.0.1 -No -U sa -P $MSSQL_SA_PW -Q "SELECT @@VERSION" >> $SQLCMD_ERRORS 2>&1
+    
+      # If the command was successful, then the SQL Server is ready.
+      if [ $? -eq 0 ]; then
+        ready=1
+        break
+      fi
+    
+      # Increment the attempt counter.
+      ((attempt++))
+    
+      # Wait before trying again.
+      sleep $delay
     done
 
-    # Display error if connection failed:
-    if [ $errstatus = 1 ]
+    # Is the SQL Server ready?
+    if [ $ready -eq 0 ]
     then
-      echo Cannot connect to SQL Server, installation aborted
+      # No, so report the error(s) and exit.
+      echo Cannot connect to SQL Server; installation aborted; errors were:
       cat $SQLCMD_ERRORS
       rm -f $SQLCMD_ERRORS
-      exit $errstatus
-    else
-      rm -f $SQLCMD_ERRORS
+      exit 1
     fi
 
+    rm -f $SQLCMD_ERRORS
+
     echo "Use sqlcmd to show which IP addresses are being listened on..."
     echo 0.0.0.0
     sqlcmd -S 0.0.0.0 -No -U sa -P $MSSQL_SA_PW -Q "SELECT @@VERSION" -l 2
@@ -78,7 +104,7 @@ steps:
     sqlcmd -No -U sa -P $MSSQL_SA_PW -Q "SELECT @@VERSION" -l 2
 
     echo "Configuring Dedicated Administer Connections to allow remote connections..."
-    sqlcmd -S 0.0.0.0 -No -U sa -P $MSSQL_SA_PW -Q "sp_configure 'remote admin connections', 1; RECONFIGURE;"
+    sqlcmd -S 127.0.0.1 -No -U sa -P $MSSQL_SA_PW -Q "sp_configure 'remote admin connections', 1; RECONFIGURE;"
     if [ $? = 1 ]
     then
       echo "Error configuring DAC for remote access."

eng/pipelines/common/templates/steps/publish-symbols-step.yml

@@ -12,7 +12,6 @@ parameters:
 
   - name: publishSymbols
     type: string
-    default: '$(PublishSymbols)'
 
   - name: symbolsVersion
     type: string

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

@@ -81,6 +81,11 @@ parameters:
   type: boolean
   default: false
 
+# The timeout, in minutes, for each test job.
+- name: testsTimeout
+  type: string
+  default: 90
+
 variables:
   - template: libraries/ci-build-variables.yml@self
 
@@ -119,6 +124,7 @@ stages:
     parameters:
       debug: ${{ parameters.debug }}
       buildType: ${{ parameters.buildType }}
+      testsTimeout: ${{ parameters.testsTimeout }}
       ${{ if eq(parameters.buildType, 'Package') }}:
         dependsOn: build_nugets
 

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

@@ -93,6 +93,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   type: boolean
   default: false
 
+# The timeout, in minutes, for each test job.
+- name: testsTimeout
+  displayName: 'Tests timeout (in minutes)'
+  type: string
+  default: 90
+
 extends:
   template: dotnet-sqlclient-ci-core.yml@self
   parameters:
@@ -106,3 +112,4 @@ extends:
     buildType: ${{ parameters.buildType }}
     buildConfiguration: ${{ parameters.buildConfiguration }}
     enableStressTests: ${{ parameters.enableStressTests }}
+    testsTimeout: ${{ parameters.testsTimeout }}

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

@@ -85,6 +85,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   type: boolean
   default: false
 
+# The timeout, in minutes, for each test job.
+- name: testsTimeout
+  displayName: 'Tests timeout (in minutes)'
+  type: string
+  default: 90
+
 extends:
   template: dotnet-sqlclient-ci-core.yml@self
   parameters:
@@ -98,3 +104,4 @@ extends:
     buildType: ${{ parameters.buildType }}
     buildConfiguration: ${{ parameters.buildConfiguration }}
     enableStressTests: ${{ parameters.enableStressTests }}
+    testsTimeout: ${{ parameters.testsTimeout }}