From cadc68ab0165b41391b1eea0680a100cf4439cfb Mon Sep 17 00:00:00 2001 From: TingluoHuang Date: Wed, 6 Nov 2019 16:18:47 -0500 Subject: [PATCH] c --- src/Misc/externals.sh | 6 ++++++ src/Runner.Common/Runner.Common.csproj | 2 +- src/Runner.Listener/Runner.Listener.csproj | 2 +- src/Runner.PluginHost/Runner.PluginHost.csproj | 2 +- src/Runner.Plugins/Runner.Plugins.csproj | 2 +- src/Runner.Sdk/Runner.Sdk.csproj | 2 +- src/Runner.Worker/Runner.Worker.csproj | 2 +- src/Sdk/Sdk.csproj | 2 +- src/Test/Test.csproj | 2 +- src/dev.sh | 6 +++--- 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh index 0f37cc254..22476024b 100755 --- a/src/Misc/externals.sh +++ b/src/Misc/externals.sh @@ -146,3 +146,9 @@ fi if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-armv7l.tar.gz" node12 fix_nested_dir fi + +if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then + acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-arm64.tar.gz" node12 fix_nested_dir + + ## TODO: alpine arm64 version node.js +fi diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index 1e866d71f..3a0b79384 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Library - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index 235850887..8d0c1d3d9 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Exe - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Runner.PluginHost/Runner.PluginHost.csproj b/src/Runner.PluginHost/Runner.PluginHost.csproj index 56255ebfe..c00e1291c 100644 --- a/src/Runner.PluginHost/Runner.PluginHost.csproj +++ b/src/Runner.PluginHost/Runner.PluginHost.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Exe - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Runner.Plugins/Runner.Plugins.csproj b/src/Runner.Plugins/Runner.Plugins.csproj index 439f35740..5bd363271 100644 --- a/src/Runner.Plugins/Runner.Plugins.csproj +++ b/src/Runner.Plugins/Runner.Plugins.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Library - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Runner.Sdk/Runner.Sdk.csproj b/src/Runner.Sdk/Runner.Sdk.csproj index 332b55328..7fc0fcee7 100644 --- a/src/Runner.Sdk/Runner.Sdk.csproj +++ b/src/Runner.Sdk/Runner.Sdk.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Library - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 64d35e90e..217380f79 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Exe - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index e9f110a92..af5025ad3 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Library - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603 diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index 035a3c182..231bb03f9 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,7 +1,7 @@  netcoreapp3.0 - win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64 + win-x64;win-x86;linux-x64;linux-arm;linux-arm64;rhel.6-x64;osx-x64 true portable-net45+win8 NU1701;NU1603;NU1603;xUnit2013; diff --git a/src/dev.sh b/src/dev.sh index 8e7858ccf..2e968f241 100755 --- a/src/dev.sh +++ b/src/dev.sh @@ -43,7 +43,7 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then CPU_NAME=$(uname -m) case $CPU_NAME in armv7l) RUNTIME_ID="linux-arm";; - aarch64) RUNTIME_ID="linux-arm";; + aarch64) RUNTIME_ID="linux-arm64";; esac fi @@ -60,7 +60,7 @@ fi # Make sure current platform support publish the dotnet runtime # Windows can publish win-x86/x64 -# Linux can publish linux-x64/arm/rhel.6-x64 +# Linux can publish linux-x64/arm/arm64/rhel.6-x64 # OSX can publish osx-x64 if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then if [[ ("$RUNTIME_ID" != 'win-x86') && ("$RUNTIME_ID" != 'win-x64') ]]; then @@ -68,7 +68,7 @@ if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then exit 1 fi elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then - if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'rhel.6-x64') ]]; then + if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'linux-arm64') && ("$RUNTIME_ID" != 'rhel.6-x64') ]]; then echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2 exit 1 fi