Skip to content

Commit

Permalink
Update LICENSE name in NuGet packaging pipelines (#17183)
Browse files Browse the repository at this point in the history
### Description
Updates NuGet packaging pipelines to use the correct license name.

### Motivation and Context
The license name changed. See #17170
The QNN_Windows_Nuget and Zip-Nuget-* pipelines will not run without this update.
  • Loading branch information
adrianlizarraga authored Aug 18, 2023
1 parent 5c54b64 commit 6ee4be7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/nuget/generate_nuspec_for_native_nuget.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def generate_icon(line_list, icon_file):


def generate_license(line_list):
line_list.append('<license type="file">LICENSE.txt</license>')
line_list.append('<license type="file">LICENSE</license>')


def generate_project_url(line_list, project_url):
Expand Down Expand Up @@ -1101,7 +1101,7 @@ def generate_files(line_list, args):
files_list.append("<file src=" + '"' + os.path.join(args.sources_path, "README.md") + '" target="README.md" />')

# Process License, ThirdPartyNotices, Privacy
files_list.append("<file src=" + '"' + os.path.join(args.sources_path, "LICENSE") + '" target="LICENSE.txt" />')
files_list.append("<file src=" + '"' + os.path.join(args.sources_path, "LICENSE") + '" target="LICENSE" />')
files_list.append(
"<file src="
+ '"'
Expand Down

0 comments on commit 6ee4be7

Please sign in to comment.