From 6ee4be724bab79377b4da3133d0a50d0fd7a284c Mon Sep 17 00:00:00 2001 From: Adrian Lizarraga Date: Thu, 17 Aug 2023 22:22:19 -0700 Subject: [PATCH] Update LICENSE name in NuGet packaging pipelines (#17183) ### Description Updates NuGet packaging pipelines to use the correct license name. ### Motivation and Context The license name changed. See https://github.com/microsoft/onnxruntime/pull/17170 The QNN_Windows_Nuget and Zip-Nuget-* pipelines will not run without this update. --- .../azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml | 2 -- tools/nuget/generate_nuspec_for_native_nuget.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml index 5921f46ae8..bc4aa63347 100644 --- a/tools/ci_build/github/azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml @@ -90,7 +90,6 @@ jobs: displayName: 'Generating nuspec for the native Nuget package x64' inputs: script: | - copy $(Build.SourcesDirectory)\LICENSE $(Build.SourcesDirectory)\LICENSE.txt python "$(Build.SourcesDirectory)\tools\nuget\generate_nuspec_for_native_nuget.py" --package_version ${{ parameters.ort_package_version }} --package_name Microsoft.ML.OnnxRuntime.QNN --target_architecture x64 --build_config ${{ parameters.build_config }} --native_build_path=$(Build.BinariesDirectory)\Windows\${{ parameters.build_config }}\${{ parameters.build_config }} --packages_path $(Build.BinariesDirectory)\Windows\packages --ort_build_path $(Build.BinariesDirectory)\Windows --sources_path $(Build.SourcesDirectory) --commit_id $(OnnxRuntimeGitCommitHash) --is_release_build ${{ parameters.IsReleaseBuild }} --sdk_info ${{ parameters.qnn_sdk_info }} cd $(Build.BinariesDirectory)\Windows\${{ parameters.build_config }}\${{ parameters.build_config }} nuget pack NativeNuget.nuspec @@ -179,7 +178,6 @@ jobs: displayName: 'Generating nuspec for the native Nuget package arm64' inputs: script: | - copy $(Build.SourcesDirectory)\LICENSE $(Build.SourcesDirectory)\LICENSE.txt python "$(Build.SourcesDirectory)\tools\nuget\generate_nuspec_for_native_nuget.py" --package_version ${{ parameters.ort_package_version }} --package_name Microsoft.ML.OnnxRuntime.QNN --target_architecture arm64 --build_config ${{ parameters.build_config }} --native_build_path=$(Build.BinariesDirectory)\Win_arm64\${{ parameters.build_config }}\${{ parameters.build_config }} --packages_path $(Build.BinariesDirectory)\Win_arm64\packages --ort_build_path $(Build.BinariesDirectory)\Win_arm64 --sources_path $(Build.SourcesDirectory) --commit_id $(OnnxRuntimeGitCommitHash) --is_release_build ${{ parameters.IsReleaseBuild }} --sdk_info ${{ parameters.qnn_sdk_info }} cd $(Build.BinariesDirectory)\Win_arm64\${{ parameters.build_config }}\${{ parameters.build_config }} nuget pack NativeNuget.nuspec diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py index 2565fd884e..fc85d87c7d 100644 --- a/tools/nuget/generate_nuspec_for_native_nuget.py +++ b/tools/nuget/generate_nuspec_for_native_nuget.py @@ -178,7 +178,7 @@ def generate_icon(line_list, icon_file): def generate_license(line_list): - line_list.append('LICENSE.txt') + line_list.append('LICENSE') def generate_project_url(line_list, project_url): @@ -1101,7 +1101,7 @@ def generate_files(line_list, args): files_list.append("') # Process License, ThirdPartyNotices, Privacy - files_list.append("') + files_list.append("') files_list.append( "