Merge branch 'release/3.0.1xx' into release/3.1.1xx-release/3.0.1xx-11-11-2019

.vsts-ci.yml

@@ -129,6 +129,13 @@ 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: ''
@@ -179,6 +186,13 @@ 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'

eng/docker/rhel.6/Dockerfile

@@ -0,0 +1,34 @@
+#
+# 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

src/redist/targets/Badge.targets

@@ -19,6 +19,7 @@
   <Target Name="SetBadgeProps" DependsOnTargets="GetCurrentRuntimeInformation">
     <PropertyGroup>
       <VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
+      <VersionBadgeMoniker Condition=" '$(Rid)' == 'rhel.6-x64' ">rhel.6_x64</VersionBadgeMoniker>
       <VersionBadgeMoniker Condition=" '$(Rid)' == 'linux-musl-x64' ">linux_musl_x64</VersionBadgeMoniker>
       <VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_$(Architecture)</VersionBadgeMoniker>
       <VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>

src/redist/targets/GenerateLayout.targets

@@ -29,7 +29,7 @@
       <CoreSetupBlobAccessTokenParam Condition="'$(InternalBuild)' == 'true'">$(DOTNETCLIMSRC_READ_SAS_TOKEN)</CoreSetupBlobAccessTokenParam>
 
       <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == '' and '$(InternalBuild)' == 'true'">https://dotnetclimsrc.blob.core.windows.net/dotnet/</CoreSetupBlobRootUrl>
-      <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
+      <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</CoreSetupBlobRootUrl>
 
       <DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == '' and '$(InternalBuild)' == 'true'">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
       <DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
@@ -77,6 +77,7 @@
       <WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
 
       <AspNetCoreSharedFxInstallerRid Condition="'$(AspNetCoreSharedFxInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreSharedFxInstallerRid>
+      <AspNetCoreSharedFxInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreSharedFxInstallerRid>
       <AspNetCoreSharedFxArchiveRid>$(AspNetCoreSharedFxInstallerRid)</AspNetCoreSharedFxArchiveRid>
       <AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
 

src/redist/targets/GetRuntimeInformation.targets

@@ -26,10 +26,12 @@
 
     <PropertyGroup>
       <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' OR
+                                   '$(Rid)' == 'rhel.6-x64' OR
                                    '$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
       <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
 
       <HostMonikerRid Condition=" '$(HostRid)' == 'ubuntu.16.04-x64' OR
+                                '$(HostRid)' == 'rhel.6-x64' OR
                                 '$(HostRid)' == 'linux-musl-x64' ">$(HostRid)</HostMonikerRid>
       <HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
       <HostMonikerRidForFileName>$(HostMonikerRid)</HostMonikerRidForFileName>

src/redist/targets/SetBuildDefaults.targets

@@ -15,6 +15,7 @@
       <UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' ">true</UsePortableLinuxSharedFramework>
       <!--<IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == ''
         AND '$(Rid)' != 'linux-x64'
+        AND '$(Rid)' != 'rhel.6-x64'
         AND '$(Rid)' != 'linux-musl-x64'
         AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>-->
       <HighEntropyVA>true</HighEntropyVA>