Skip to content

Commit

Permalink
Fix DML packaging CIs (#21997)
Browse files Browse the repository at this point in the history
### Description
<!-- Describe your changes. -->
The DML CIs build native and C# as well as sign DLLs in the same CI.
Some parts of that require .net 8 and some .net 6.
Update to use .net 8 in general, and revert to .net 6 for the signing.


### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
Fix packaging pipeline.
  • Loading branch information
skottmckay authored Sep 5, 2024
1 parent 5e24c5d commit 8b661f7
Showing 1 changed file with 15 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ stages:
buildDirectory: '$(Build.BinariesDirectory)'
BuildCommand: ${{ parameters.BuildCommand }}
OnnxRuntimeBuildDirectory: '$(Build.BinariesDirectory)'
DotNetExe: 'dotnet.exe'
runCodesignValidationInjection: and(${{ parameters.DoNodejsPack }},${{ parameters. DoEsrp}}) #For the others, code sign is in a separated job
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
ALLOW_RELEASED_ONNX_OPSET_ONLY: ${{ parameters.AllowReleasedOpsetOnly }}
Expand Down Expand Up @@ -97,6 +96,13 @@ stages:
modifyEnvironment: true
workingFolder: '$(Build.BinariesDirectory)'

# need to set PROCESSOR_ARCHITECTURE so the x86 SDK is installed correctly
- task: UseDotNet@2
inputs:
version: 8.x
env:
PROCESSOR_ARCHITECTURE: ${{ parameters.BuildArch }}

- task: PowerShell@2
displayName: 'Install ONNX'
inputs:
Expand Down Expand Up @@ -202,7 +208,14 @@ stages:
filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
arguments: ${{ parameters.BuildArch }}
modifyEnvironment: true
# Esrp signing

# Esrp signing. Requires older .net SDK currently (ESRP v5.1.1)
- task: UseDotNet@2
inputs:
version: 6.x
env:
PROCESSOR_ARCHITECTURE: ${{ parameters.BuildArch }}

- template: ../../templates/win-esrp-dll.yml
parameters:
FolderPath: '$(Build.BinariesDirectory)\$(BuildConfig)\$(BuildConfig)'
Expand Down

0 comments on commit 8b661f7

Please sign in to comment.