From 65d5730631ef3cae8435be66b37b6c03b49d5dbf Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 19 Apr 2018 16:16:12 -0700 Subject: [PATCH] Replace alpine with linux-musl builds We still build linux-musl on the alpine OS but we no longer produce a alpine installer/tar file instead we just have the linux-musl version. --- README.md | 12 ++++++------ .../AppWithCorruptedLaunchSettings.csproj | 2 +- .../AppWithLaunchSettings.csproj | 2 +- .../AppWithLaunchSettingsNoDefault.csproj | 2 +- .../MSBuildTestApp/MSBuildTestApp.csproj | 2 +- build/Branding.props | 6 +++--- build/BuildDefaults.props | 6 +++--- build/DerivedHostMachineInfo.props | 2 +- build/publish/Badge.targets | 2 +- .../CheckIfAllBuildsHavePublished.cs | 2 +- netci.groovy | 6 +++--- .../Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj | 2 +- .../EnvironmentInfo.cs | 6 +++--- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 9e7fd399b..66bc27538 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux arm64 Archive|Linux Native Installers|RHEL 6 Archive|Alpine 3.6 Archive| +|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux arm64 Archive|Linux Native Installers|RHEL 6 Archive|Linux-musl Archive| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linux-arm64-build-badge]][linux-arm64-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][alpine3.6-build-badge]][alpine3.6-build]| +|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linux-arm64-build-badge]][linux-arm64-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][linux-musl-build-badge]][linux-musl-build]| [win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6902/badge [win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6902 @@ -51,8 +51,8 @@ Build Status [rhel6-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/7392/badge [rhel6-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=7392 -[alpine3.6-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8168/badge -[alpine3.6-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8168 +[linux-musl-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8168/badge +[linux-musl-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8168 Installers and Binaries ----------------------- @@ -74,7 +74,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **Linux arm** | [tar.gz][linux-arm-targz] - [Checksum][linux-arm-targz-checksum] | | **Linux arm64** | [tar.gz][linux-arm64-targz] - [Checksum][linux-arm64-targz-checksum] | | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | -| **Alpine 3.6** | [tar.gz][alpine-3.6-targz] - [Checksum][alpine-3.6-targz-checksum] | +| **Linux-musl** | [tar.gz][linux-musl-targz] - [Checksum][linux-musl-targz-checksum] | | Latest Coherent Build2
*release/2.1.3xx* | |:------:| @@ -173,7 +173,7 @@ apt-cache search dotnet-sdk | grep 2.0.0 Docker ------ -You can also use our Docker base images found on https://hub.docker.com/r/microsoft/dotnet to set up your dev or testing environment for usage. +You can also use our Docker base images found on https://hub.docker.com/r/microsoft/dotnet to set up your dev or testing environment for usage. Basic usage ----------- diff --git a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj index 9434c36c9..bde0adabe 100644 --- a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj @@ -4,6 +4,6 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 diff --git a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj index 9434c36c9..bde0adabe 100644 --- a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj @@ -4,6 +4,6 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 diff --git a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj index 9434c36c9..bde0adabe 100644 --- a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj +++ b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj @@ -4,6 +4,6 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 852eafe13..de20e4481 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -4,7 +4,7 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 $(TEST_PACKAGES) diff --git a/build/Branding.props b/build/Branding.props index a13a74294..2db7f6455 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -13,19 +13,19 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) $(Architecture) - + dotnet-sdk-internal dotnet-sdk $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index 1c4460790..e1c354c67 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -6,10 +6,10 @@ false true - true + true false - true - true + true + true true diff --git a/build/DerivedHostMachineInfo.props b/build/DerivedHostMachineInfo.props index 3e9712a68..2bb794527 100644 --- a/build/DerivedHostMachineInfo.props +++ b/build/DerivedHostMachineInfo.props @@ -2,7 +2,7 @@ true true - true + true true diff --git a/build/publish/Badge.targets b/build/publish/Badge.targets index 5c8931de0..3493b5880 100644 --- a/build/publish/Badge.targets +++ b/build/publish/Badge.targets @@ -31,7 +31,7 @@ $(OSName)_$(Architecture) rhel.6_x64 - alpine.3.6_x64 + linux_musl_x64 linux_$(Architecture) all_linux_distros_native_installer diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index c2f349624..53e1f7e1a 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -54,7 +54,7 @@ namespace Microsoft.DotNet.Cli.Build { "osx_x64", false }, { "linux_x64", false }, { "rhel.6_x64", false }, - { "alpine.3.6_x64", false }, + { "linux_musl_x64", false }, { "all_linux_distros_native_installer", false }, { "linux_arm", false }, { "linux_arm64", false } diff --git a/netci.groovy b/netci.groovy index 75edf396a..6a1cb40a9 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT_ES:x64:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'RHEL6:x64:Debug', 'Alpine3.6:x64:Debug', 'Linux:arm:Debug', 'Linux:arm64:Debug'] +def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT_ES:x64:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'RHEL6:x64:Debug', 'Linux-musl:x64:Debug', 'Linux:arm:Debug', 'Linux:arm64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -55,9 +55,9 @@ set DOTNET_CLI_UI_LANGUAGE=es osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id rhel.6-x64 --docker rhel.6 --targets Default" } - else if (os == 'Alpine3.6') { + else if (os == 'Linux-musl') { osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id alpine.3.6-x64 --docker alpine.3.6 --targets Default" + buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id linux-musl-x64 --docker alpine.3.6 --targets Default" } else { // Jenkins non-Ubuntu CI machines don't have docker diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index c4b59fb35..b480a818f 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs index 51e2cfd06..1412fad7c 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { case "fedora.24-x64": case "rhel.6-x64": - case "alpine.3.6-x64": + case "linux-musl-x64": case "opensuse.42.1-x64": case "ubuntu.16.10-x64": case "linux-x64": @@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { case "linux-x64": case "rhel.6-x64": - case "alpine.3.6-x64": + case "linux-musl-x64": return false; } } @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities switch (rid) { case "rhel.6-x64": - case "alpine.3.6-x64": + case "linux-musl-x64": return false; } }