diff options
| author | Steve MacLean <sdmaclea.qdt@qualcommdatacenter.com> | 2017-08-01 20:24:51 -0400 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2017-08-01 17:24:51 -0700 |
| commit | ca006da16473f009ef0bc74ea2394d244258c2cf (patch) | |
| tree | 4dd9fd64759ee1e829ea4466b7bd2ff1c17ea114 | |
| parent | 59f2a57563b7488779a9b93220a9dfe5c6a45700 (diff) | |
| download | coreclr-ca006da16473f009ef0bc74ea2394d244258c2cf.tar.gz coreclr-ca006da16473f009ef0bc74ea2394d244258c2cf.tar.bz2 coreclr-ca006da16473f009ef0bc74ea2394d244258c2cf.zip | |
[Arm64/Unix] Add OfficialBuildRID linux-arm64 (#12372)
* [Arm64/Unix] Add OfficialBuildRID linux-arm64
* [Arm64/Unix] Fix nuget package build
| -rwxr-xr-x | netci.groovy | 2 | ||||
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props | 2 | ||||
| -rw-r--r-- | src/.nuget/dir.props | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy index a1712ddc5c..b93b07271b 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1794,7 +1794,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR } if (!enableCorefxTesting) { - buildCommands += "ROOTFS_DIR=/opt/arm64-xenial-rootfs ./build.sh skipmscorlib verbose ${lowerConfiguration} ${architecture} cross clang3.8 skipnuget ${standaloneGc}" + buildCommands += "ROOTFS_DIR=/opt/arm64-xenial-rootfs ./build.sh verbose ${lowerConfiguration} ${architecture} cross clang3.8 ${standaloneGc}" // HACK -- Arm64 does not have corefx jobs yet. buildCommands += "git clone https://github.com/dotnet/corefx fx" diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index d62f4d645c..dd34d3dae5 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -4,11 +4,13 @@ <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'arm'">true</_PlatformDoesNotSupportCreatedump> <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'armel'">true</_PlatformDoesNotSupportCreatedump> <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'x86'">true</_PlatformDoesNotSupportCreatedump> + <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'arm64'">true</_PlatformDoesNotSupportCreatedump> <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true</_PlatformDoesNotSupportCreatedump> <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true</_PlatformDoesNotSupportEventTrace> <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'arm64'">true</_PlatformDoesNotSupportEventTrace> <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true</_PlatformDoesNotSupportEventTrace> <_PlatformDoesNotSupportSosPlugin Condition="'$(_runtimeOSFamily)' == 'android'">true</_PlatformDoesNotSupportSosPlugin> + <_PlatformDoesNotSupportSosPlugin Condition="'$(Platform)' == 'arm64'">true</_PlatformDoesNotSupportSosPlugin> </PropertyGroup> <ItemGroup> <NativeBinary Include="$(BinDir)libcoreclr.so" /> diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 52e94365dc..87bce5b32a 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -135,6 +135,9 @@ <OfficialBuildRID Include="linux-arm"> <Platform>arm</Platform> </OfficialBuildRID> + <OfficialBuildRID Include="linux-arm64"> + <Platform>arm64</Platform> + </OfficialBuildRID> <OfficialBuildRID Include="tizen.4.0.0-armel"> <Platform>armel</Platform> </OfficialBuildRID> |