From 0d233cd9d0cfc1a4d903a963045ce21483e0ab4c Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 26 Sep 2017 18:13:03 -0700
Subject: [PATCH 1/4] Insert SDK 2.0.2-vspre-20170927-1

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 0b028d79e..4f43825c2 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -12,7 +12,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>2.0.2-vspre-20170921-5</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>2.0.2-vspre-20170927-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>

From 79077b5ea214e1bfe154dc96e8b85dd9ee9e0140 Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Wed, 27 Sep 2017 09:52:43 -0700
Subject: [PATCH 2/4] MSBuild 15.4.8

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 4f43825c2..9d9ec4f9a 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.4.7</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.4.8</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>

From e59fd7af46bc99df0395446fe7460ef7c135e2b2 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Fri, 6 Oct 2017 10:53:21 -0700
Subject: [PATCH 3/4] Use temporary path for fake deps.json in test

(cherry picked from commit 796b4a06e7f095cb9f89d3eb7f29496627286b0d)
---
 .../GivenAProjectToolsCommandResolver.cs               | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 83a877151..8f857caf1 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -266,14 +266,8 @@ namespace Microsoft.DotNet.Tests
 
             var lockFile = new LockFileFormat().Read(lockFilePath);
 
-            var depsJsonFile = Path.Combine(
-                Path.GetDirectoryName(lockFilePath),
-                "dotnet-portable.deps.json");
-
-            if (File.Exists(depsJsonFile))
-            {
-                File.Delete(depsJsonFile);
-            }
+            // NOTE: We must not use the real deps.json path here as it will interfere with tests running in parallel.
+            var depsJsonFile = Path.GetTempFileName();
             File.WriteAllText(depsJsonFile, "temp");
 
             var projectToolsCommandResolver = SetupProjectToolsCommandResolver();

From 3d52d24058ca9c32b1c82462091c168f94a64476 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Fri, 13 Oct 2017 09:43:04 -0700
Subject: [PATCH 4/4] Separating the 'legacy' URL construction from the
 'current' URL construction methods and logic.

---
 scripts/obtain/dotnet-install.sh | 54 ++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh
index 1db273f24..e409fe06d 100755
--- a/scripts/obtain/dotnet-install.sh
+++ b/scripts/obtain/dotnet-install.sh
@@ -58,7 +58,7 @@ say_verbose() {
 # This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets,
 #   then and only then should the Linux distribution appear in this list.
 # Adding a Linux distribution to this list does not imply distribution-specific support.
-get_os_download_name_from_platform() {
+get_legacy_os_name_from_platform() {
     eval $invocation
 
     platform="$1"
@@ -87,10 +87,6 @@ get_os_download_name_from_platform() {
             echo "opensuse.42.1"
             return 0
             ;;
-        "rhel.6"*)
-            echo "rhel.6"
-            return 0
-            ;;
         "rhel.7"*)
             echo "rhel"
             return 0
@@ -115,6 +111,30 @@ get_os_download_name_from_platform() {
     return 1
 }
 
+get_linux_platform_name() {
+    eval $invocation
+
+    if [ -n "$runtime_id" ]; then
+        echo "${runtime_id%-*}"
+        return 0
+    else
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            echo "$ID.$VERSION_ID"
+            return 0
+        elif [ -e /etc/redhat-release ]; then
+            local redhatRelease=$(</etc/redhat-release)
+            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
+                echo "rhel.6"
+                return 0
+            fi
+        fi
+    fi
+    
+    say_verbose "Linux specific platform name and version could not be detected: $ID.$VERSION_ID"
+    return 1
+}
+
 get_current_os_name() {
     eval $invocation
 
@@ -123,11 +143,11 @@ get_current_os_name() {
         echo "osx"
         return 0
     elif [ "$uname" = "Linux" ]; then
-        local distro_specific_osname
-        distro_specific_osname=$(get_distro_specific_os_name) || return 1
+        local linux_platform_name
+        linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; }
 
-        if [ "$distro_specific_osname" = "rhel.6" ]; then
-            echo $distro_specific_osname
+        if [[ $linux_platform_name == "rhel.6"* ]]; then
+            echo "rhel.6"
             return 0
         else
             echo "linux"
@@ -139,7 +159,7 @@ get_current_os_name() {
     return 1
 }
 
-get_distro_specific_os_name() {
+get_legacy_os_name() {
     eval $invocation
 
     local uname=$(uname)
@@ -147,22 +167,16 @@ get_distro_specific_os_name() {
         echo "osx"
         return 0
     elif [ -n "$runtime_id" ]; then
-        echo $(get_os_download_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
+        echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
         return 0
     else
         if [ -e /etc/os-release ]; then
             . /etc/os-release
-            os=$(get_os_download_name_from_platform "$ID.$VERSION_ID" || echo "")
+            os=$(get_legacy_os_name_from_platform "$ID.$VERSION_ID" || echo "")
             if [ -n "$os" ]; then
                 echo "$os"
                 return 0
             fi
-        elif [ -e /etc/redhat-release ]; then
-            local redhatRelease=$(</etc/redhat-release)
-            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
-                echo "rhel.6"
-                return 0
-            fi
         fi
     fi
     
@@ -203,7 +217,7 @@ check_pre_reqs() {
     fi
 
     if [ "$(uname)" = "Linux" ]; then
-        if ! [ -x "$(command -v ldconfig)" ]; then
+        if [ ! -x "$(command -v ldconfig)" ]; then
             echo "ldconfig is not in PATH, trying /sbin/ldconfig."
             LDCONFIG_COMMAND="/sbin/ldconfig"
         else
@@ -457,7 +471,7 @@ construct_legacy_download_link() {
     local specific_version="${4//[$'\t\r\n']}"
 
     local distro_specific_osname
-    distro_specific_osname="$(get_distro_specific_os_name)" || return 1
+    distro_specific_osname="$(get_legacy_os_name)" || return 1
 
     local legacy_download_link=null
     if [ "$shared_runtime" = true ]; then