Fix RHEL 7 Build

There were two issues:

 - $__BuildArch is not defined in init-tools.sh, so we would always
   download the ubuntu version of the CLI, since our check for
   `rhel.7.2-x64` would never fire.

 - There was a small RHEL specific bug in BuildTools itself that
   manifested when we actually were able to download the CLI and try to
   restore the runtime.

Commit migrated from https://github.com/dotnet/coreclr/commit/e3b44b0823bbf53383161e7f4530226ce4954ac6

diff --git a/src/coreclr/BuildToolsVersion.txt b/src/coreclr/BuildToolsVersion.txt
index a5c2101..b0cf27d 100644 (file)
--- a/src/coreclr/BuildToolsVersion.txt
+++ b/src/coreclr/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.25-prerelease-00427-02
+1.0.25-prerelease-00429-01

diff --git a/src/coreclr/init-tools.sh b/src/coreclr/init-tools.sh
index f10da60..6c0002f 100755 (executable)
--- a/src/coreclr/init-tools.sh
+++ b/src/coreclr/init-tools.sh
@@ -8,7 +8,7 @@ initDistroName()
             export __DistroRid=""
         else
             source /etc/os-release
-            export __DistroRid="$ID.$VERSION_ID-$__BuildArch"
+            export __DistroRid="$ID.$VERSION_ID-x64"
         fi
     fi
 }