Merge pull request #17561 from ianhays/1.1_tool_over

[1.1] Replace tool-runtime binaries with portable linux binaries

Author: Ian Hays

init-tools.sh

@@ -46,13 +46,11 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
                         if  [ "$__DISTRO_NAME" == 'ubuntu.16.04' ] ||
                             [ "$__DISTRO_NAME" == 'ubuntu.16.10' ] ||
                             [ "$__DISTRO_NAME" == 'ubuntu.18.04' ] ||
-                            [ "$__DISTRO_NAME" == 'debian.8' ] ||
                             [ "$__DISTRO_NAME" == 'fedora.23' ] ||
                             [ "$__DISTRO_NAME" == 'fedora.24' ] ||
                             [ "$__DISTRO_NAME" == 'fedora.27' ] ||
                             [ "$__DISTRO_NAME" == 'opensuse.13.2' ] ||
-                            [ "$__DISTRO_NAME" == 'opensuse.42.1' ] ||
-                            [ "$__DISTRO_NAME" == 'opensuse.42.3' ] ; then
+                            [ "$__DISTRO_NAME" == 'opensuse.42.1' ]; then
                             __PKG_RID=$__DISTRO_NAME
                         fi
                     fi
@@ -113,6 +111,11 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
         exit $?
     fi
 
+    # Replace the binaries restored by the tool runtime script with the portable binaries
+    if [ "$__PKG_RID" == "linux" ]; then
+         cp -r $__DOTNET_PATH/shared/Microsoft.NETCore.App/*/* $__TOOLRUNTIME_DIR
+    fi
+
     touch $__INIT_TOOLS_DONE_MARKER
     echo "Done initializing tools."
 else