Skip to content

Commit c2b4040

Browse files
FooRidercopybara-github
authored andcommitted
Include also ARM build of protoc in nuget package (#21568)
Closes #21568 COPYBARA_INTEGRATE_REVIEW=#21568 from FooRider:nuget-include-linuxaarch64 c6d5853 PiperOrigin-RevId: 755009744
1 parent b79fe6e commit c2b4040

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

csharp/Google.Protobuf.Tools.nuspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<file src="protoc/windows_x64/protoc.exe" target="tools/windows_x64/protoc.exe"/>
2121
<file src="protoc/linux_x86/protoc" target="tools/linux_x86/protoc"/>
2222
<file src="protoc/linux_x64/protoc" target="tools/linux_x64/protoc"/>
23+
<file src="protoc/linux_aarch64/protoc" target="tools/linux_aarch64/protoc"/>
2324
<file src="protoc/macosx_x64/protoc" target="tools/macosx_x64/protoc"/>
2425
<file src="src/google/protobuf/any.proto" target="tools/google/protobuf"/>
2526
<file src="src/google/protobuf/api.proto" target="tools/google/protobuf"/>

csharp/Google.Protobuf.Tools.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<protoc_tools>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/../tools/'))</protoc_tools>
44
<protoc_linux64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/linux_x64/protoc'))</protoc_linux64>
55
<protoc_linux86>$([System.IO.Path]::GetFullPath('$(protoc_tools)/linux_x86/protoc'))</protoc_linux86>
6+
<protoc_linuxaarch64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/linux_aarch64/protoc'))</protoc_linuxaarch64>
67
<protoc_macosx64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/macosx_x64/protoc'))</protoc_macosx64>
78
<protoc_macosx86>$([System.IO.Path]::GetFullPath('$(protoc_tools)/macosx_x86/protoc'))</protoc_macosx86>
89
<protoc_windows64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/windows_x64/protoc.exe'))</protoc_windows64>

csharp/build_tools.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ fi
1616

1717
VERSION_NUMBER=$1
1818
# <directory name> <binary file name> pairs.
19-
declare -a FILE_NAMES=( \
20-
windows_x86 windows-x86_32.exe \
21-
windows_x64 windows-x86_64.exe \
22-
macosx_x64 osx-x86_64.exe \
23-
linux_x86 linux-x86_32.exe \
24-
linux_x64 linux-x86_64.exe \
19+
declare -a FILE_NAMES=( \
20+
windows_x86 windows-x86_32.exe \
21+
windows_x64 windows-x86_64.exe \
22+
macosx_x64 osx-x86_64.exe \
23+
linux_x86 linux-x86_32.exe \
24+
linux_x64 linux-x86_64.exe \
25+
linux_aarch64 linux-aaarch_64.exe \
2526
)
2627

2728
set -e

0 commit comments

Comments
 (0)