diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2c754dfa2..4d67be1b5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -88,13 +88,6 @@ stages: strategy: matrix: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_14_04_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.14.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Ubuntu_16_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.16.04' @@ -109,20 +102,6 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Fedora_27_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.27' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Fedora_28_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.28' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Fedora_29_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker fedora.29' @@ -137,7 +116,7 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Debian_Jessie_Debug_x64: + Build_Debian_Stretch_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' @@ -151,13 +130,6 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Rhel_6_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker rhel.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id rhel.6-x64' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' @@ -208,13 +180,6 @@ stages: _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' _DropSuffix: '' - Build_Rhel_6_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id rhel.6-x64' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Linux_musl_Release_x64: _BuildConfig: Release _DockerParameter: '--docker alpine.3.6' diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index 6511762c8..891658239 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,21 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-jessie-debpkg-58e4974-20190328133153 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-d61254f-20190807161114 + +# Install the deb packaging toolchain we need to build debs +RUN apt-get update \ + && apt-get -y install \ + debhelper \ + build-essential \ + devscripts \ + locales \ + && rm -rf /var/lib/apt/lists/* + +# liblldb is needed so deb package build does not throw missing library info errors +RUN apt-get update \ + && apt-get -y install liblldb-3.9 \ + && rm -rf /var/lib/apt/lists/* # Misc Dependencies for build RUN rm -rf /var/lib/apt/lists/* && \ @@ -13,6 +27,8 @@ RUN rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + +RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0 diff --git a/eng/docker/fedora.23/Dockerfile b/eng/docker/fedora.23/Dockerfile deleted file mode 100644 index 0d156e137..000000000 --- a/eng/docker/fedora.23/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs - -# Install tools used by the VSO build automation. -RUN dnf install -y findutils && \ - dnf clean all - -# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts. -RUN dnf upgrade -y nss -RUN dnf clean all - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.24/Dockerfile b/eng/docker/fedora.24/Dockerfile deleted file mode 100644 index ff1edb0a0..000000000 --- a/eng/docker/fedora.24/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM fedora:24 - -RUN dnf install -y bash git cmake wget which python clang-3.8.0-1.fc24.x86_64 llvm-devel-3.8.0-1.fc24.x86_64 make libicu-devel lldb-devel.x86_64 \ - libunwind-devel.x86_64 lttng-ust-devel.x86_64 uuid-devel libuuid-devel tar glibc-locale-source zlib-devel libcurl-devel \ - krb5-devel openssl-devel autoconf libtool hostname - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.27/Dockerfile b/eng/docker/fedora.27/Dockerfile deleted file mode 100644 index f6eaa8fbd..000000000 --- a/eng/docker/fedora.27/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:fedora-27-82a3800-20180326211504 - -RUN dnf install -y findutils - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/fedora.28/Dockerfile b/eng/docker/fedora.28/Dockerfile deleted file mode 100644 index 5e08f7a19..000000000 --- a/eng/docker/fedora.28/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:fedora-28-c103199-20180628122443 - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Override RID set by the dotnet-buildtools-prereqs docker image -ENV __PUBLISH_RID=fedora.28-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile deleted file mode 100644 index 9e2e572d0..000000000 --- a/eng/docker/rhel.6/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331 - -# yum doesn't work with the special curl version we have in the base docker image, -# so we remove /usr/local/lib from the library path for this command -RUN yum -q -y install sudo - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g root -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permssions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/bin/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set library path to make CURL and ICU libraries that are in /usr/local/lib visible -ENV LD_LIBRARY_PATH /usr/local/lib - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} - -# Set up Azure Artifacts credential provider -RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash diff --git a/eng/docker/ubuntu.14.04/Dockerfile b/eng/docker/ubuntu.14.04/Dockerfile deleted file mode 100644 index 7e7cb6bdb..000000000 --- a/eng/docker/ubuntu.14.04/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:14.04 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - lldb-3.6 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/netci.groovy b/netci.groovy deleted file mode 100644 index e964e99bb..000000000 --- a/netci.groovy +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -// Import the utility functionality. - -import jobs.generation.ArchivalSettings; -import jobs.generation.Utilities; - -def project = GithubProject -def branch = GithubBranchName -def isPR = true - -def platformList = [ - 'AllLinux:x64:Release', - 'CentOS7.1:x64:Debug', - 'Debian8.2:x64:Debug', - 'fedora.27:x64:Debug', - 'Linux:arm:Debug', - 'Linux:arm64:Debug', - 'Linux-musl:x64:Debug', - 'Linux:x64:Release', - 'Linux_NoSuffix:arm:Release', - 'Linux_NoSuffix:x64:Release', - 'OSX10.12:x64:Release', - 'RHEL6:x64:Debug', - 'RHEL7.2:x64:Release', - 'Ubuntu:x64:Release', - 'Ubuntu16.04:x64:Debug', - 'ubuntu.18.04:x64:Debug', - 'Windows_NT:x64:Release', - 'Windows_NT:x86:Debug', - 'Windows_NT_ES:x64:Debug', - 'Windows_NT_NoSuffix:x64:Release' -] - -def static getBuildJobName(def configuration, def os, def architecture) { - return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() -} - -platformList.each { platform -> - // Calculate names - def (os, architecture, configuration) = platform.tokenize(':') - def osUsedForMachineAffinity = os; - def osVersionUsedForMachineAffinity = 'latest-or-auto'; - - // Calculate job name - def jobName = getBuildJobName(configuration, os, architecture) - def baseBatchBuildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default"; - def baseShellBuildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"; - - // Calculate the build command - if (os.startsWith("Windows_NT")) { - osUsedForMachineAffinity = 'Windows_NT' - buildCommand = "${baseBatchBuildCommand}" - if (os == 'Windows_NT_ES') { - buildCommand = """ -set DOTNET_CLI_UI_LANGUAGE=es -${buildCommand} -""" - } - else if (os == 'Windows_NT_NoSuffix') { - buildCommand = """ -set DropSuffix=true -${buildCommand} -""" - } - } - else if (os == 'Windows_2016') { - buildCommand = "${baseBatchBuildCommand} -RunInstallerTestsInDocker" - } - else if (os.startsWith("Linux")) { - osUsedForMachineAffinity = 'Ubuntu16.04'; - if (os == 'Linux-musl') { - buildCommand = "${baseShellBuildCommand} --runtime-id linux-musl-x64 --docker alpine.3.6" - } - else - { - buildCommand = "${baseShellBuildCommand} --linux-portable" - if ((architecture == 'arm') || (architecture == 'arm64')) { - buildCommand = "${buildCommand} --architecture ${architecture} /p:CLIBUILD_SKIP_TESTS=true" - } - if (os == 'Linux_NoSuffix') { - buildCommand = """ -export DropSuffix=true -${buildCommand} -""" - } - } - } - else if (os == 'Ubuntu') { - buildCommand = "${baseShellBuildCommand} --docker ubuntu.14.04" - } - else if (os == 'RHEL6') { - osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" - } - else if (os == 'ubuntu.18.04' || os == 'fedora.27') { - osUsedForMachineAffinity = 'Ubuntu16.04' - osVersionUsedForMachineAffinity = 'latest-docker' - buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" - } - else if (os == 'AllLinux') { - osUsedForMachineAffinity = 'Ubuntu16.04' - buildCommand = "${baseShellBuildCommand} --skip-prereqs --configuration ${configuration} --targets Default /t:BuildAndPublishAllLinuxDistrosNativeInstallers" - } - else { - buildCommand = "${baseShellBuildCommand}" - } - - def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { - // Set the label. - steps { - if (osUsedForMachineAffinity == 'Windows_NT' || osUsedForMachineAffinity == 'Windows_2016') { - // Batch - batchFile(buildCommand) - } - else { - // Shell - shell(buildCommand) - } - } - } - - Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity) - Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - // ARM and AllLinux CI runs are build only. - if ((architecture != 'arm') && (architecture != 'arm64') && (os != 'AllLinux')) { - Utilities.addMSTestResults(newJob, '**/*.trx') - } - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") - - def archiveSettings = new ArchivalSettings() - archiveSettings.addFiles("test/**/*.trx") - archiveSettings.addFiles("*.binlog") - archiveSettings.setFailIfNothingArchived() - archiveSettings.setArchiveOnFailure() - Utilities.addArchival(newJob, archiveSettings) -} - -// Make the call to generate the help job -Utilities.createHelperJob(this, project, branch, - "Welcome to the ${project} Repository", // This is prepended to the help message - "Have a nice day!") // This is appended to the help message. You might put known issues here. - -Utilities.addCROSSCheck(this, project, branch) diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index 8e9ccc4ac..f7416fef7 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -19,7 +19,6 @@ $(OSName)_$(Architecture) - rhel.6_x64 linux_musl_x64 linux_$(Architecture) all_linux_distros_native_installer diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5248ebeda..e46c59629 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -77,7 +77,6 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) - linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 9248c46c8..695a56908 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -26,14 +26,10 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index b31e5350d..268100720 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -9,16 +9,13 @@ ($(Rid.StartsWith('rhel.6')) OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) - OR $(Rid.StartsWith('fedora.27')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false true true diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index d33fe2504..71fccbc63 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,6 +63,10 @@ false + + false + + false