[Arm64] Enable crossgen for linux-arm64

Commit migrated from https://github.com/dotnet/core-setup/commit/0b32b3b0c009071e99aeedb7cc6c544410296270

diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json
index 200a783..6195572 100644 (file)
--- a/src/installer/buildpipeline/pipeline.json
+++ b/src/installer/buildpipeline/pipeline.json
@@ -82,7 +82,7 @@
           "Parameters": {
             "PB_DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180316023254",
             "PB_TargetArchitecture": "arm64",
-            "PB_AdditionalBuildArguments":"-TargetArchitecture=arm64 -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
+            "PB_AdditionalBuildArguments":"-TargetArchitecture=arm64 -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
             "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_CrossBuildArgs": "-e ROOTFS_DIR=$(ROOTFS_DIR) ",
             "PB_PortableBuild": "true"

diff --git a/src/installer/netci.groovy b/src/installer/netci.groovy
index cd73586..4029595 100644 (file)
--- a/src/installer/netci.groovy
+++ b/src/installer/netci.groovy
@@ -64,7 +64,7 @@ platformList.each { platform ->
             dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}"
             buildArgs += " -SkipTests=true -CrossBuild=true"
 
-            if (architecture == 'armel' || architecture == 'arm64') {
+            if (architecture == 'armel') {
                 buildArgs += " -DisableCrossgen=true"
             }
 

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
index 87fa32b..c66fd4f 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
@@ -64,7 +64,7 @@
 
     <PropertyGroup>
       <_crossDir Condition="'$(TargetArchitecture)' == 'arm'">/x86_arm</_crossDir>
-      <_crossDir Condition="'$(NuGetRuntimeIdentifier)' == 'win10-arm64' or '$(NuGetRuntimeIdentifier)' == 'win-arm64'">/x64_arm64</_crossDir>
+      <_crossDir Condition="'$(TargetArchitecture)' == 'arm64'">/x64_arm64</_crossDir>
     </PropertyGroup>
 
     <PropertyGroup Condition="'@(_runtimeCLR)' != ''">