Add support for .NET 9

build.proj

@@ -19,7 +19,7 @@
     <IsEnabledWindows Condition="'$(TargetsUnix)' == 'true'">false</IsEnabledWindows>
     <TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsWindows)' == 'true'">Windows</TestOS>
     <TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsUnix)' == 'true'">Unix</TestOS>
-    <TF Condition="$(TF) == ''">net8.0</TF> <!-- Default Target Framework -->
+    <TF Condition="$(TF) == ''">net9.0</TF> <!-- Default Target Framework -->
     <TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETFramework'">netfx</TFGroup>
     <TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETCoreApp'">netcore</TFGroup>
     <TargetGroup Condition="'$(TFGroup)' == 'netfx'" >netfx</TargetGroup>
@@ -187,7 +187,7 @@
 
   <Target Name="RunManualTests">
     <!-- Windows -->
     <Exec ConsoleToMsBuild="true" Command="$(DotnetPath)dotnet test &quot;@(ManualTestsProj)&quot; -p:Configuration=$(Configuration) -p:Target$(TFGroup)Version=$(TF) -p:ReferenceType=$(ReferenceType) --no-build -l &quot;console;verbosity=normal&quot; --collect &quot;Code coverage&quot; -p:TestSet=$(TestSet) --results-directory $(ResultsDirectory) -p:TestTargetOS=Windows$(TargetGroup) --filter &quot;category!=non$(TargetGroup)tests&amp;category!=failing&amp;category!=nonwindowstests&quot; &quot;--logger:trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)&quot;" Condition="'$(IsEnabledWindows)' == 'true'"/>
     <!-- Unix -->
     <Exec ConsoleToMsBuild="true" Command="$(DotnetPath)dotnet test &quot;@(ManualTestsProj)&quot; -p:Configuration=$(Configuration) -p:TargetNetCoreVersion=$(TF) -p:ReferenceType=$(ReferenceType) --no-build -l &quot;console;verbosity=normal&quot; --collect &quot;Code coverage&quot; -p:TestSet=$(TestSet) --results-directory $(ResultsDirectory) -p:TestTargetOS=Unixnetcoreapp --filter &quot;category!=nonnetcoreapptests&amp;category!=failing&amp;category!=nonlinuxtests&amp;category!=nonuaptests&quot; &quot;--logger:trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)&quot;" Condition="'$(IsEnabledWindows)' != 'true'"/>
   </Target>

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

@@ -20,6 +20,18 @@ parameters:
       - Package
 
 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'
+
 - ${{if eq(parameters.debug, true)}}:
   - powershell: |
       Get-ChildItem env: | Sort-Object Name

eng/pipelines/common/templates/steps/ci-project-build-step.yml

@@ -34,6 +34,18 @@ parameters:
       - all
 
 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'
+
 - ${{ if or(eq(parameters.operatingSystem, 'Windows'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
   - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all')) }}:
     - task: MSBuild@1

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

@@ -27,6 +27,7 @@ parameters:
     default:
     - net462
     - net8.0
+    - net9.0
 
   - name: product
     default: MDS

eng/pipelines/common/templates/steps/prepare-test-db-step.yml

@@ -10,7 +10,7 @@ parameters:
 
   - name: targetFramework
     type: string
-    default: net8.0
+    default: net9.0
 
 steps:
 - task: DotNetCoreCLI@2

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

@@ -3,7 +3,7 @@
 # The .NET Foundation licenses this file to you under the MIT license.          #
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
-parameters: # parameters are shown up in ADO UI in a build queue time
+parameters:
 - name: 'debug'
   displayName: 'Enable debug output'
   type: boolean
@@ -12,17 +12,17 @@ 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'
   type: object
-  default: net8.0
+  default: net9.0
 
 - name: buildPlatforms
   displayName: 'Build Platforms on Windows'

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

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

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

@@ -5,6 +5,11 @@
 // NOTE: The current Microsoft.VSDesigner editor attributes are implemented for System.Data.SqlClient, and are not publicly available.
 // New attributes that are designed to work with Microsoft.Data.SqlClient and are publicly documented should be included in future.
 
+using System;
+#if NET
+using System.Diagnostics.CodeAnalysis;
+#endif
+
 [assembly: System.CLSCompliant(true)]
 namespace Microsoft.Data
 {
@@ -1298,6 +1303,9 @@ public override void Close() { }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetEnumerator/*'/>
         public override System.Collections.IEnumerator GetEnumerator() { throw null; }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldType/*'/>
+#if NET
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)]
+#endif
         public override System.Type GetFieldType(int i) { throw null; }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldValue/*'/>
         public override T GetFieldValue<T>(int i) { throw null; }
@@ -1318,6 +1326,9 @@ public override void Close() { }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetOrdinal/*'/>
         public override int GetOrdinal(string name) { throw null; }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetProviderSpecificFieldType/*'/>
+#if NET
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)]
+#endif
         public override System.Type GetProviderSpecificFieldType(int i) { throw null; }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetProviderSpecificValue/*'/>
         public override object GetProviderSpecificValue(int i) { throw null; }
@@ -2278,6 +2289,9 @@ public SqlDataRecord(params Microsoft.Data.SqlClient.Server.SqlMetaData[] metaDa
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetDouble/*'/>
         public virtual double GetDouble(int ordinal) { throw null; }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetFieldType/*'/>
+#if NET
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)]
+#endif
         public virtual System.Type GetFieldType(int ordinal) { throw null; }
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetFloat/*'/>
         public virtual float GetFloat(int ordinal) { throw null; }

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>
@@ -861,6 +861,8 @@
     <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>
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
   <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs

@@ -174,7 +174,7 @@ internal static bool ValidateSslServerCertificate(Guid connectionId, string targ
                 {
                     try
                     {
-                        validationCertificate = new X509Certificate(validationCertFileName);
+                        validationCertificate = X509CertificateLoader.LoadCertificateFromFile(validationCertFileName);
                     }
                     catch (Exception e)
                     {

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

@@ -1334,8 +1334,6 @@ override public IEnumerator GetEnumerator()
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldType/*' />
 #if !NETFRAMEWORK
-        [SuppressMessage("ReflectionAnalysis", "IL2093:MismatchOnMethodReturnValueBetweenOverrides",
-                   Justification = "Annotations for DbDataReader was not shipped in net6.0")]
         [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
         override public Type GetFieldType(int i)

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -799,6 +799,9 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
       <Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)System\IO\StreamExtensions.netfx.cs">
+      <Link>System\IO\StreamExtensions.netfx.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\Microsoft\Data\Common\NameValuePermission.cs" />
@@ -896,6 +899,8 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
+    <PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
   </ItemGroup>
   <Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />
   <Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs

@@ -1448,8 +1448,6 @@ override public IEnumerator GetEnumerator()
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldType/*' />
 #if !NETFRAMEWORK
-        [SuppressMessage("ReflectionAnalysis", "IL2093:MismatchOnMethodReturnValueBetweenOverrides",
-                   Justification = "Annotations for DbDataReader was not shipped in net6.0")]
         [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
         override public Type GetFieldType(int i)

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

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net462</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<RootNamespace />
 	</PropertyGroup>
@@ -10,6 +10,8 @@
 	<ItemGroup>
 	  <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
 	  <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-	</ItemGroup>
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
+    <PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
+  </ItemGroup>
 
 </Project>

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

@@ -152,7 +152,8 @@ private object DeNormalizeInternal(
                 if (nullByte == 0)
                 {
                     result = _nullInstance;
-                    s.Read(_padBuffer, 0, _padBuffer.Length);
+                    s.ReadExactly(_padBuffer, 0, _padBuffer.Length);
+
                     return result;
                 }
             }
@@ -288,7 +289,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 +380,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 b[0] ^= 0x80;
@@ -406,7 +407,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 Array.Reverse(b);
@@ -433,7 +434,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 b[0] ^= 0x80;
@@ -460,7 +461,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 Array.Reverse(b);
@@ -487,7 +488,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 b[0] ^= 0x80;
@@ -514,7 +515,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 Array.Reverse(b);
@@ -559,7 +560,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 if ((b[0] & 0x80) > 0)
@@ -614,7 +615,7 @@ 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];
-            s.Read(b, 0, b.Length);
+            s.ReadExactly(b, 0, b.Length);
             if (!_skipNormalize)
             {
                 if ((b[0] & 0x80) > 0)

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs

@@ -168,7 +168,7 @@ internal class HealthReport
         public HealthReport(byte[] payload)
         {
             Size = payload.Length;
-            Certificate = new X509Certificate2(payload);
+            Certificate = X509CertificateLoader.LoadCertificate(payload);
         }
 
         public int GetSizeInPayload()