Use NET9 sdk in signing pipeline (#3039)

* Use NET9 sdk in signing pipeline. * Add net9.0 to AKV targets. * Fix typo.
dotnet · Nov 26, 2024 · fca9c27 · fca9c27
1 parent 0a4ad6f
commit fca9c27
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml b/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'

diff --git a/eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml b/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}}'

diff --git a/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props b/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>