From 6f82f6c31fdeaccee50b1e9221fa8dec6afdaaf5 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 16 Feb 2017 14:40:39 -0800 Subject: [PATCH] Remove all references to OpenSuse13.2 Commit migrated from https://github.com/dotnet/coreclr/commit/6b282079e9ced0254e61b3a4ee835249c885713b --- src/coreclr/build-test.cmd | 1 - src/coreclr/build.sh | 3 --- src/coreclr/config.json | 2 +- src/coreclr/init-tools.sh | 4 ---- src/coreclr/src/.nuget/dir.props | 1 - 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index de4ddcc..a214aef 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -370,7 +370,6 @@ echo alpine.3.4.3-x64: Builds overlay for Alpine 3.4.3 echo debian.8-x64: Builds overlay for Debian 8 echo fedora.23-x64: Builds overlay for Fedora 23 echo fedora.24-x64: Builds overlay for Fedora 23 -echo opensuse.13.2-x64: Builds overlay for OpenSUSE 13.2 echo opensuse.42.1-x64: Builds overlay for OpenSUSE 42.1 echo osx.10.10-x64: Builds overlay for OSX 10.10 echo rhel.7-x64: Builds overlay for RHEL 7 or CentOS diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index bc4adb4..7caaa75 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -319,9 +319,6 @@ isMSBuildOnNETCoreSupported() "fedora.24-x64") __isMSBuildOnNETCoreSupported=1 ;; - "opensuse.13.2-x64") - __isMSBuildOnNETCoreSupported=1 - ;; "opensuse.42.1-x64") __isMSBuildOnNETCoreSupported=1 ;; diff --git a/src/coreclr/config.json b/src/coreclr/config.json index be0b4bd..2d25b6a 100644 --- a/src/coreclr/config.json +++ b/src/coreclr/config.json @@ -303,7 +303,7 @@ "RuntimeId": { "description": "Specifies the OS to build Core_Root for", "valueType": "property", - "values": [ "debian.8-x64", "fedora.23-x64", "opensuse.13.2-x64", "opensuse.42.1-x64", "osx.10.10-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ], + "values": [ "debian.8-x64", "fedora.23-x64", "opensuse.42.1-x64", "osx.10.10-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ], "defaultValue": "${__RuntimeId}" }, "UpdateDependencies": { diff --git a/src/coreclr/init-tools.sh b/src/coreclr/init-tools.sh index 9a5c8b3..995e882 100755 --- a/src/coreclr/init-tools.sh +++ b/src/coreclr/init-tools.sh @@ -52,10 +52,6 @@ get_current_linux_name() { return 0 fi elif [ "$(cat /etc/os-release | grep -cim1 opensuse)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 13.2)" -eq 1 ]; then - echo "opensuse.13.2" - return 0 - fi if [ "$(cat /etc/os-release | grep -cim1 42.1)" -eq 1 ]; then echo "opensuse.42.1" return 0 diff --git a/src/coreclr/src/.nuget/dir.props b/src/coreclr/src/.nuget/dir.props index bdae27a..8f2e9cb 100644 --- a/src/coreclr/src/.nuget/dir.props +++ b/src/coreclr/src/.nuget/dir.props @@ -89,7 +89,6 @@ - -- 2.7.4