diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 77d70a532..67048053d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -114,12 +114,6 @@ stages: _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - Build_Rhel_6_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker rhel.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id rhel.6-x64' - _BuildArchitecture: 'x64' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' @@ -151,12 +145,6 @@ stages: _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' - Build_Rhel_6_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id rhel.6-x64' - _BuildArchitecture: 'x64' Build_Linux_musl_Release_x64: _BuildConfig: Release _DockerParameter: '--docker alpine.3.6' diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9ad3a77c..102b1d87c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 780f26a116f0dce23207efba4ff348e747203604 - - https://github.com/dotnet/core-setup - c77948d92a2f950140f09384f057cb893ec3955a + + https://github.com/dotnet/runtime + c07be36e3ce00b06e99d02669fd658a813cdce11 - - https://github.com/dotnet/core-setup - c77948d92a2f950140f09384f057cb893ec3955a + + https://github.com/dotnet/runtime + c07be36e3ce00b06e99d02669fd658a813cdce11 - - https://github.com/dotnet/core-setup - c77948d92a2f950140f09384f057cb893ec3955a + + https://github.com/dotnet/runtime + c07be36e3ce00b06e99d02669fd658a813cdce11 - - https://github.com/dotnet/core-setup - c77948d92a2f950140f09384f057cb893ec3955a + + https://github.com/dotnet/runtime + c07be36e3ce00b06e99d02669fd658a813cdce11 - - https://github.com/dotnet/core-setup - c77948d92a2f950140f09384f057cb893ec3955a + + https://github.com/dotnet/runtime + c07be36e3ce00b06e99d02669fd658a813cdce11 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/corefx - 5cee7c97d602f294e27c582d4dab81ec388f1d7b + + https://github.com/dotnet/runtime + c07be36e3ce00b06e99d02669fd658a813cdce11 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 741366fcd..7b087b34b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,15 +63,15 @@ - 5.0.0-alpha.1.19563.6 + 5.0.0-alpha.1.20057.6 - 5.0.0-alpha.1.19564.1 - 5.0.0-alpha.1.19564.1 - 5.0.0-alpha.1.19564.1 - 5.0.0-alpha.1.19564.1 - 5.0.0-alpha.1.19564.1 + 5.0.0-alpha.1.20057.6 + 5.0.0-alpha.1.20057.6 + 5.0.0-alpha.1.20057.6 + 5.0.0-alpha.1.20057.6 + 5.0.0-alpha.1.20057.6 2.1.0 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