Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use NET9 sdk in signing pipeline #3039

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Use NET9 sdk in signing pipeline #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a602a69
Use NET9 sdk in signing pipeline.
mdaigle Nov 26, 2024
128dd9c
Add net9.0 to AKV targets.
mdaigle Nov 26, 2024
23d12d0
Fix typo.
mdaigle Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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}}'
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading