Merge branch 'main' into merge/netfx-diagnostics

Author: edwardneal

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/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 }}

eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

@@ -62,6 +62,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
+
 variables:
   - template: /eng/pipelines/libraries/variables.yml@self
   - name: packageFolderName
@@ -161,6 +167,7 @@ extends:
         parameters:
           packageFolderName: $(packageFolderName)
           isPreview: ${{ parameters['isPreview'] }}
+          timeout: ${{ parameters.testsTimeout }}
           downloadPackageStep:
             download: current
             artifact: $(packageFolderName)

src/Directory.Build.props

@@ -113,23 +113,20 @@
   </PropertyGroup>
 
   <!--
-    For non-.NET, we explicitly set the C# language version to 13.  This matches
-    the language version used by the .NET 9 SDK, and provides helpful modern
-    language features.  While this isn't strictly supported by .NET in general,
-    it works well in practice.  There are very few C# language features that
-    depend on SDK APIs, and we avoid them.
+    We want to use the latest C# language regardless of target framework,
+    so we explicitly set LangVersion for all targets.
 
-    For .NET, we omit this property entirely, which results in the SDK choosing
-    the C# language version that matches the .NET version.
+    We will roll this version forward as new C# language versions are released
+    and associated with the newest .NET SDK we support.
 
     Details here:
 
     https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-versioning
 
     https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version
   -->
-  <PropertyGroup
-    Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' != '.NETCoreApp'">
-    <LangVersion>13.0</LangVersion>
+  <PropertyGroup>
+    <!-- The newest .NET SDK we support is .NET 9.0, which uses C# 13 -->
+    <LangVersion>13</LangVersion>
   </PropertyGroup>
 </Project>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

@@ -434,6 +434,8 @@ internal void Connect(ServerInfo serverInfo,
                 false,
                 true,
                 fParallel,
+                TransparentNetworkResolutionState.DisabledMode,
+                -1,
                 _connHandler.ConnectionOptions.IPAddressPreference,
                 FQDNforDNSCache,
                 ref _connHandler.pendingSQLDNSObject,
@@ -532,6 +534,8 @@ internal void Connect(ServerInfo serverInfo,
                     true,
                     true,
                     fParallel,
+                    TransparentNetworkResolutionState.DisabledMode,
+                    -1,
                     _connHandler.ConnectionOptions.IPAddressPreference,
                     FQDNforDNSCache,
                     ref _connHandler.pendingSQLDNSObject,

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

@@ -21,7 +21,7 @@ internal abstract partial class TdsParserStateObject
         // Constructors //
         //////////////////
 
-        internal TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
+        protected TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
         {
             // Construct a MARS session
             Debug.Assert(parser != null, "no parser?");
@@ -57,40 +57,17 @@ internal TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCon
         // General methods //
         /////////////////////
 
-        internal abstract void CreatePhysicalSNIHandle(
-            string serverName,
-            TimeoutTimer timeout,
-            out byte[] instanceName,
-            out ResolvedServerSpn resolvedSpn,
-            bool flushCache,
-            bool async,
-            bool fParallel,
-            SqlConnectionIPAddressPreference iPAddressPreference,
-            string cachedFQDN,
-            ref SQLDNSInfo pendingDNSInfo,
-            string serverSPN,
-            bool isIntegratedSecurity = false,
-            bool tlsFirst = false,
-            string hostNameInCertificate = "",
-            string serverCertificateFilename = "");
-
-        internal abstract void AssignPendingDNSInfo(string userProtocol, string DNSCacheKey, ref SQLDNSInfo pendingDNSInfo);
-
-        protected abstract void CreateSessionHandle(TdsParserStateObject physicalConnection, bool async);
-
-        protected abstract void FreeGcHandle(int remaining, bool release);
-
         internal abstract uint EnableSsl(ref uint info, bool tlsFirst, string serverCertificateFilename);
 
-        internal abstract void Dispose();
-
         internal abstract uint CheckConnection();
 
         internal int DecrementPendingCallbacks(bool release)
         {
             int remaining = Interlocked.Decrement(ref _pendingCallbacks);
             SqlClientEventSource.Log.TryAdvancedTraceEvent("TdsParserStateObject.DecrementPendingCallbacks | ADV | State Object Id {0}, after decrementing _pendingCallbacks: {1}", _objectID, _pendingCallbacks);
+            
             FreeGcHandle(remaining, release);
+
             // NOTE: TdsParserSessionPool may call DecrementPendingCallbacks on a TdsParserStateObject which is already disposed
             // This is not dangerous (since the stateObj is no longer in use), but we need to add a workaround in the assert for it
             Debug.Assert((remaining == -1 && SessionHandle.IsNull) || (0 <= remaining && remaining < 3), $"_pendingCallbacks values is invalid after decrementing: {remaining}");