Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

external/corefx/cross/arm32_ci_script.sh

@@ -189,13 +189,13 @@ function cross_build_corefx_with_docker {
         # TODO: For arm, we are going to embed RootFS inside Docker image.
         case $__linuxCodeName in
         trusty)
-            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1404_cross_prereqs_v2"
+            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20172211042239"
             __skipRootFS=1
             __dockerEnvironmentVariables="-e ROOTFS_DIR=/crossrootfs/arm"
             __runtimeOS="ubuntu.14.04"
         ;;
         xenial)
-            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1604_cross_prereqs_v2"
+            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-ef0ac75-20175511035548"
             __skipRootFS=1
             __dockerEnvironmentVariables="-e ROOTFS_DIR=/crossrootfs/arm"
             __runtimeOS="ubuntu.16.04"
@@ -208,7 +208,9 @@ function cross_build_corefx_with_docker {
         # For armel Tizen, we are going to construct RootFS on the fly.
         case $__linuxCodeName in
         tizen)
-            __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v2"
+            __dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs"
+            __skipRootFS=1
+            __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build"
             __runtimeOS="tizen.4.0.0"
         ;;
         *)
@@ -231,38 +233,13 @@ function cross_build_corefx_with_docker {
     fi
 
     # Cross building corefx with rootfs in Docker
-    __buildNativeCmd="/opt/corefx/build-native.sh -buildArch=$__buildArch -$__buildConfig -- cross $__verboseFlag"
-    if [ "$__buildArch" == "arm" ]; then
-        __buildManagedCmd="./build-managed.sh -$__buildConfig -buildArch=$__buildArch -RuntimeOS=$__runtimeOS"
-    else
-        # TODO-armel: We can use same option to arm, i.e. -buildArch and -RuntimeOS options for armel,
-        #              when CoreCLR packages are also available at NuGet server for armel.
-        __buildManagedCmd="./build-managed.sh -$__buildConfig -BuildPackages=false"
-
-    fi
-    $__dockerCmd $__buildNativeCmd
-    $__dockerCmd $__buildManagedCmd
-    sudo chown -R $(id -u -n) ./bin
-
     if [ "$__buildArch" == "armel" ]; then
-        # TODO-armel: This is a workaround. We don't need this if we can build managed for armel in above.
-        # Construct runtime directory
-        if [[ "$__buildConfig" == "release" ]]; then
-            __runtimePath="./bin/runtime/netcoreapp-Linux-Release-armel"
-            __managedPath="./bin/runtime/netcoreapp-Linux-Release-x64"
-        else
-            __runtimePath="./bin/runtime/netcoreapp-Linux-Debug-armel"
-            __managedPath="./bin/runtime/netcoreapp-Linux-Debug-x64"
-        fi
+        __extraCmd="/p:OverridePackageSource=https://tizen.myget.org/F/dotnet-core/api/v3/index.json"
+    fi
 
-        pushd $__managedPath
-        rm apphost corerun dotnet
-        rm *.so
-        rm *.ni.dll
-        popd
-        mv $__managedPath/* $__runtimePath/
-        rmdir $__managedPath
-    fi 
+    __buildCmd="./build.sh -buildArch=$__buildArch -$__buildConfig -RuntimeOS=$__runtimeOS -- $__extraCmd"
+    $__dockerCmd $__buildCmd
+    sudo chown -R $(id -u -n) ./bin
 }
 
 #Define script variables