mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-29 20:14:01 +00:00
Upgrade 4 stages in nuget pipeline to VS2022 (#16825)
### Description ### Motivation and Context Continue upgrading to VS2022 ### Verfication https://dev.azure.com/aiinfra/Lotus/_build/results?buildId=331377&view=results N.B. In practice, SDLNativeRules@3 doesn't support VS2019.
This commit is contained in:
Yi Zhang
GitHub
parent
8b30dc11d7
commit
f88f0d8e36
2 changed files with 20 additions and 26 deletions
|
|
@ -794,11 +794,11 @@ stages:
|
|||
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'onnxruntime-Win2019-GPU-dml-A10'
|
||||
AgentPool : 'onnxruntime-Win2022-GPU-dml-A10'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
ArtifactName: 'drop-nuget-dml'
|
||||
StageName: 'Windows_CI_GPU_DML_Dev'
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 16 2019"
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 17 2022"
|
||||
BuildArch: 'x64'
|
||||
msbuildArchitecture: 'amd64'
|
||||
EnvSetupScript: 'setup_env.bat'
|
||||
|
|
@ -817,11 +817,11 @@ stages:
|
|||
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'onnxruntime-Win2019-GPU-dml-A10'
|
||||
AgentPool : 'onnxruntime-Win2022-GPU-dml-A10'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
ArtifactName: 'drop-win-dml-x86-zip'
|
||||
StageName: 'Windows_CI_GPU_DML_Dev_x86'
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 16 2019"
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 17 2022"
|
||||
BuildArch: 'x86'
|
||||
EnvSetupScript: 'setup_env_x86.bat'
|
||||
sln_platform: 'Win32'
|
||||
|
|
@ -840,11 +840,11 @@ stages:
|
|||
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'onnxruntime-Win2019-GPU-dml-A10'
|
||||
AgentPool : 'onnxruntime-Win2022-GPU-dml-A10'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
ArtifactName: 'drop-win-dml-arm64-zip'
|
||||
StageName: 'Windows_CI_GPU_DML_Dev_arm64'
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --arm64 --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 16 2019"
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --arm64 --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 17 2022"
|
||||
BuildArch: 'x64'
|
||||
EnvSetupScript: 'setup_env.bat'
|
||||
sln_platform: 'arm64'
|
||||
|
|
@ -863,11 +863,11 @@ stages:
|
|||
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'onnxruntime-Win-CPU-2019'
|
||||
AgentPool : 'onnxruntime-Win-CPU-2022'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
ArtifactName: 'drop-win-dml-arm-zip'
|
||||
StageName: 'Windows_CI_GPU_DML_Dev_arm'
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --arm --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 16 2019"
|
||||
BuildCommand: --build_dir $(Build.BinariesDirectory) --arm --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --use_winml --cmake_generator "Visual Studio 17 2022"
|
||||
BuildArch: 'x64'
|
||||
EnvSetupScript: 'setup_env.bat'
|
||||
sln_platform: 'arm'
|
||||
|
|
|
|||
|
|
@ -31,36 +31,30 @@ steps:
|
|||
**/*.obj
|
||||
**/*.pdb
|
||||
**/*.dll
|
||||
#Manually set msBuildCommandline so that we can also set CAExcludePath
|
||||
- task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@2
|
||||
|
||||
# Manually set msBuildCommandline so that we can also set CAExcludePath
|
||||
- task: SDLNativeRules@3
|
||||
displayName: 'Run the PREfast SDL Native Rules for MSBuild'
|
||||
inputs:
|
||||
userProvideBuildInfo: msBuildInfo
|
||||
msBuildArchitecture: x64
|
||||
${{ if eq(parameters.vs2022, false)}}:
|
||||
msBuildVersion: 16.0
|
||||
msBuildCommandline: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64\msbuild.exe" "$(Build.BinariesDirectory)\RelWithDebInfo\onnxruntime.sln" /p:platform="${{parameters.msbuildPlatform}}" /p:configuration="RelWithDebInfo" /p:CAExcludePath="$(Build.BinariesDirectory);$(Build.SourcesDirectory)\cmake;C:\program files (x86)" /p:VisualStudioVersion="17.0" /m /p:PreferredToolArchitecture=x64'
|
||||
${{ else }}:
|
||||
msBuildVersion: 17.0
|
||||
msBuildCommandline: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\amd64\msbuild.exe" "$(Build.BinariesDirectory)\RelWithDebInfo\onnxruntime.sln" /p:platform="${{parameters.msbuildPlatform}}" /p:configuration="RelWithDebInfo" /p:CAExcludePath="$(Build.BinariesDirectory);$(Build.SourcesDirectory)\cmake;C:\program files (x86)" /p:VisualStudioVersion="17.0" /m /p:PreferredToolArchitecture=x64'
|
||||
continueOnError: true
|
||||
msBuildVersion: 17.0
|
||||
msBuildCommandline: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\amd64\msbuild.exe" "$(Build.BinariesDirectory)\RelWithDebInfo\onnxruntime.sln" /p:platform="${{parameters.msbuildPlatform}}" /p:configuration="RelWithDebInfo" /p:CAExcludePath="$(Build.BinariesDirectory);$(Build.SourcesDirectory)\cmake;C:\program files (x86)" /p:VisualStudioVersion="17.0" /m /p:PreferredToolArchitecture=x64'
|
||||
excludedPaths: '$(Build.SourcesDirectory)\b#$(Build.SourcesDirectory)\cmake#C:\program files'
|
||||
|
||||
- task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
|
||||
- task: SdtReport@2
|
||||
displayName: 'Create Security Analysis Report'
|
||||
inputs:
|
||||
BinSkim: true
|
||||
BinSkimBreakOn: WarningAbove
|
||||
CredScan: true
|
||||
SDLNativeRules: true
|
||||
|
||||
- task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
|
||||
- task: PublishSecurityAnalysisLogs@3
|
||||
displayName: 'Publish Security Analysis Logs'
|
||||
continueOnError: true
|
||||
|
||||
- task: securedevelopmentteam.vss-secure-development-tools.build-task-uploadtotsa.TSAUpload@1
|
||||
- task: TSAUpload@2
|
||||
displayName: 'TSA upload'
|
||||
condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
|
||||
displayName: 'TSA Upload'
|
||||
inputs:
|
||||
tsaVersion: TsaV2
|
||||
codeBaseName: 'onnxruntime_main'
|
||||
GdnPublishTsaOnboard: false
|
||||
GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa'
|
||||
continueOnError: true
|
||||
|
|
|
|||
Loading…
Reference in a new issue