diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e0ea69874..bc353e101 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,8 +1,8 @@ - 2.0.3-servicing-25808-01 - 15.4.7 + 2.0.3 + 15.4.8 2.3.2-beta1-61921-05 2.3.0-pre-20170727-1 1.6.0-beta2-25304 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=$(