Add support for .NET 9

eng/pipelines/common/templates/steps/ci-prebuild-step.yml

@@ -20,6 +20,14 @@ parameters:
       - Package
 
 steps:
+
+- task: UseDotNet@2
+  displayName: 'Download .NET SDK'
+  inputs:
+    packageType: 'sdk'
+    version: '9.x'
+    includePreviewVersions: true
+
 - ${{if eq(parameters.debug, true)}}:
   - powershell: |
       Get-ChildItem env: | Sort-Object Name

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

@@ -12,12 +12,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
 - name: targetFrameworks
   displayName: 'Target Frameworks on Windows'
   type: object
-  default: [net462, net8.0]
+  default: [net462, net8.0, net9.0]
 
 - name: targetFrameworksLinux
   displayName: 'Target Frameworks on Non-Windows'
   type: object
-  default: [net8.0]
+  default: [net8.0, net9.0]
 
 - name: netcoreVersionTestUtils
   displayName: 'Netcore Version for Test Utilities'
@@ -157,7 +157,7 @@ stages:
         windows_sql_22: 
           pool: ${{parameters.defaultPoolName }}
           images:
-            Win22_Sql22: ADO-MMS22-SQL22 
+            Win22_Sql22: ADO-MMS22-SQL22-Net9.0 
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}

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

@@ -45,12 +45,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
 - name: targetFrameworks
   displayName: 'Target Frameworks on Windows'
   type: object
-  default: [net462, net8.0]
+  default: [net462, net8.0, net9.0]
 
 - name: targetFrameworksLinux
   displayName: 'Target Frameworks on Non-Windows'
   type: object
-  default: [net8.0]
+  default: [net8.0, net9.0]
 
 - name: buildPlatforms
   displayName: 'Build Platforms on Windows'

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

@@ -37,12 +37,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
 - name: targetFrameworks
   displayName: 'Target Frameworks on Windows'
   type: object
-  default: [net462, net8.0]
+  default: [net462, net8.0, net9.0]
 
 - name: targetFrameworksLinux
   displayName: 'Target Frameworks on Non-Windows'
   type: object
-  default: [net8.0]
+  default: [net8.0, net9.0]
 
 - name: buildPlatforms
   displayName: 'Build Platforms on Windows'

eng/pipelines/libraries/mds-validation-variables.yml

@@ -17,15 +17,15 @@ variables:
   - name: expectedFolderNames
     value: lib,ref,runtimes
   - name: expectedDotnetVersions
-    value: net462,net8.0
+    value: net462,net8.0,net9.0
   - name: Database
     value: Northwind
   - name: platform
     value: AnyCPU
   - name: TargetNetFxVersion
     value: net481
   - name: TargetNetCoreVersion
-    value: net8.0
+    value: net9.0
   - name: SQLTarget
     value: localhost
   - name: encrypt

src/Directory.Build.props

@@ -86,6 +86,7 @@
   <!-- Provides Version properties -->
   <Import Project="$(ToolsDir)props\Versions.props" />
   <Import Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" Project="$(ToolsDir)props\VersionsNet8OrLater.props" />
+  <Import Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Project="$(ToolsDir)props\VersionsNet9OrLater.props" />
   <!-- Provides Tool properties -->
   <Import Project="$(ToolsDir)props\Tools.props" />
   <!-- Provides Build properties -->

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0, net9.0</TargetFrameworks>
     <IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
     <OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml</DocumentationFile>

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS'">Microsoft.Data.SqlClient is not supported on this platform.</GeneratePlatformNotSupportedAssemblyMessage>
     <OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
     <TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlNormalizer.cs

@@ -152,7 +152,11 @@ private object DeNormalizeInternal(
                 if (nullByte == 0)
                 {
                     result = _nullInstance;
-                    s.Read(_padBuffer, 0, _padBuffer.Length);
+#if NET8_0_OR_GREATER
+                    s.ReadExactly(_padBuffer, 0, _padBuffer.Length);
+#else
+                   s.Read(_padBuffer, 0, _padBuffer.Length);
+#endif
                     return result;
                 }
             }
@@ -288,7 +292,7 @@ protected void FlipAllBits(byte[] b)
         protected object GetValue(FieldInfo fi, object obj) => fi.GetValue(obj);
 #if NETFRAMEWORK
         [System.Security.Permissions.ReflectionPermission(System.Security.Permissions.SecurityAction.Assert, MemberAccess = true)]
-#endif 
+#endif
         protected void SetValue(FieldInfo fi, object recvr, object value) => fi.SetValue(recvr, value);
 
         internal abstract int Size { get; }
@@ -379,7 +383,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[2];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 b[0] ^= 0x80;
@@ -406,7 +414,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[2];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 Array.Reverse(b);
@@ -433,7 +445,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[4];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 b[0] ^= 0x80;
@@ -460,7 +476,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[4];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 Array.Reverse(b);
@@ -487,7 +507,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[8];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 b[0] ^= 0x80;
@@ -514,7 +538,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[8];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 Array.Reverse(b);
@@ -559,7 +587,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[4];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 if ((b[0] & 0x80) > 0)
@@ -614,7 +646,11 @@ internal override void Normalize(FieldInfo fi, object obj, Stream s)
         internal override void DeNormalize(FieldInfo fi, object recvr, Stream s)
         {
             byte[] b = new byte[8];
+#if NET8_0_OR_GREATER
+            s.ReadExactly(b, 0, b.Length);
+#else
             s.Read(b, 0, b.Length);
+#endif
             if (!_skipNormalize)
             {
                 if ((b[0] & 0x80) > 0)

src/Microsoft.Data.SqlClient/tests/Directory.Build.props

@@ -12,6 +12,7 @@
     <Configurations>Debug;Release;</Configurations>
     <Platforms>AnyCPU;x86;x64</Platforms>
     <ReferenceType Condition="'$(ReferenceType)'==''">Project</ReferenceType>
+    <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->

src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AssemblyName>PerformanceTests</AssemblyName>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Configurations>Debug;Release;</Configurations>
     <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform).$(AssemblyName)</IntermediateOutputPath>

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <StartupObject>Microsoft.Data.SqlClient.ExtUtilities.Runner</StartupObject>
   </PropertyGroup>
   <ItemGroup>

tools/props/VersionsNet9OrLater.props

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Net9 project dependencies -->
+  <PropertyGroup>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-preview.6.24327.7</SystemConfigurationConfigurationManagerVersion>
+    <SystemRuntimeCachingVersion>9.0.0-preview.6.24327.7</SystemRuntimeCachingVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-preview.6.24327.7</MicrosoftExtensionsCachingMemoryVersion>
+  </PropertyGroup>
+</Project>