Skip to content

Commit fca9c27

Browse files
authored
Use NET9 sdk in signing pipeline (#3039)
* Use NET9 sdk in signing pipeline. * Add net9.0 to AKV targets. * Fix typo.
1 parent 0a4ad6f commit fca9c27

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ steps:
3030
secureFile: netfxKeypair.snk
3131
retryCount: 5
3232

33+
- task: UseDotNet@2
34+
displayName: 'Use .NET 9.x sdk'
35+
inputs:
36+
packageType: sdk
37+
version: '9.x'
38+
39+
- task: UseDotNet@2
40+
displayName: 'Install .NET 8.x runtime'
41+
inputs:
42+
packageType: runtime
43+
version: '8.x'
44+
3345
- ${{ if eq(parameters.product, 'MDS') }}:
3446
- task: MSBuild@1
3547
displayName: 'BuildAllConfigurations using build.proj'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ steps:
7878
7979
Write-Host "Artifacts fetched for testing"
8080
Get-Location
81-
displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
81+
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
8282
8383
- ${{ if eq(parameters.product, 'AKV') }}:
8484
- powershell: |
@@ -95,7 +95,7 @@ steps:
9595
9696
Write-Host "Artifacts fetched for testing"
9797
Get-Location
98-
displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
98+
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
9999
100100
- powershell: |
101101
$software = '${{parameters.softwareFolder}}'

src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
1818
<PropertyGroup>
1919
<TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net462</TargetNetFxVersion>
20-
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0</TargetNetCoreVersion>
20+
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0;net9.0</TargetNetCoreVersion>
2121
</PropertyGroup>
2222

2323
<ItemGroup>
@@ -34,7 +34,7 @@
3434
<!-- Set Target Framework when TestTargetOS is not empty. (Command Line) -->
3535
<Otherwise>
3636
<PropertyGroup>
37-
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">net8.0</TargetFrameworks>
37+
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">net8.0;net9.0</TargetFrameworks>
3838
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net462</TargetFrameworks>
3939
</PropertyGroup>
4040
</Otherwise>

0 commit comments

Comments
 (0)