diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 8619d5581..a0eeef007 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -4,6 +4,7 @@ trigger:
include:
- master
- release/*
+ - internal/release/3.*
variables:
- name: _PublishBlobFeedUrl
@@ -129,6 +130,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 +187,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'
diff --git a/NuGet.config b/NuGet.config
index a8b3a2d1f..61137ec82 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,5 +19,8 @@
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 30fb02466..7df2fb299 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -51,7 +51,7 @@
https://github.com/aspnet/AspNetCore
5033efb3fe947f6237713d1e016e0e769c63c0d2
-
+
https://github.com/aspnet/AspNetCore
5033efb3fe947f6237713d1e016e0e769c63c0d2
@@ -98,9 +98,9 @@
-
+
https://github.com/dotnet/wcf
- fbb5aef10b235e98332c6f5c27de47826e84ef4d
+ eb417fdeb06faeada140a92e26e86c266574476a
diff --git a/eng/Versions.props b/eng/Versions.props
index 7ed1045ff..a6be3d1d4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,17 +29,17 @@
- 1.0.2-beta4.19511.1
+ 1.0.2-beta4.19570.1
- 1.7.0
+ 1.7.1
5.0.0-alpha1.19605.1
5.0.0-alpha1.19605.1
- 5.0.0-alpha1.19605.1
+ 5.0.0-alpha1.19605.1
5.0.0-alpha1.19605.1
5.0.0-alpha1.19605.1
5.0.0-alpha1.19605.1
@@ -98,11 +98,11 @@
4.8.0-rc2.19462.10
3.0.0
- 1.6.4
+ 1.6.5
2.0.0-preview8.19373.1
$(MicrosoftDotNetCommonItemTemplates30PackageVersion)
1.0.2-beta4.19354.2
- 3.0.0
+ 3.0.1
1.6.0
1.0.2-beta4
diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile
new file mode 100644
index 000000000..9e2e572d0
--- /dev/null
+++ b/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
diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets
index f7416fef7..8e9ccc4ac 100644
--- a/src/redist/targets/Badge.targets
+++ b/src/redist/targets/Badge.targets
@@ -19,6 +19,7 @@
$(OSName)_$(Architecture)
+ rhel.6_x64
linux_musl_x64
linux_$(Architecture)
all_linux_distros_native_installer
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 5389586e6..3f1965390 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -4,7 +4,7 @@
$(AspNetCorePackageVersionFor31Templates.IndexOf('-'))
$(AspNetCorePackageVersionFor31Templates)
- $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator)))
+ $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator)))
$(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount)
$(AspNetCore31VersionMajorMinorPatchVersion)
$(BundledTemplates31InstallPath)-$(VersionSuffix)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index e3d975489..04d73e9f2 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -14,23 +14,23 @@
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)
- <_NETCoreApp30RuntimePackVersion>3.0.0
+ <_NETCoreApp30RuntimePackVersion>3.0.1
<_NETCoreApp30TargetingPackVersion>3.0.0
- <_NETCoreApp31RuntimePackVersion>3.1.0-preview1.19506.1
- <_NETCoreApp31TargetingPackVersion>$(_NETCoreApp31RuntimePackVersion)
+ <_NETCoreApp31RuntimePackVersion>3.1.0
+ <_NETCoreApp31TargetingPackVersion>3.1.0
- <_WindowsDesktop30RuntimePackVersion>$(_NETCoreApp30RuntimePackVersion)
- <_WindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion)
+ <_WindowsDesktop30RuntimePackVersion>3.0.1
+ <_WindowsDesktop30TargetingPackVersion>3.0.0
- <_WindowsDesktop31RuntimePackVersion>$(_NETCoreApp31RuntimePackVersion)
- <_WindowsDesktop31TargetingPackVersion>$(_NETCoreApp31TargetingPackVersion)
+ <_WindowsDesktop31RuntimePackVersion>3.1.0
+ <_WindowsDesktop31TargetingPackVersion>3.1.0
- <_AspNet30RuntimePackVersion>3.0.0
- <_AspNet30TargetingPackVersion>3.0.0
+ <_AspNet30RuntimePackVersion>3.0.1
+ <_AspNet30TargetingPackVersion>3.0.1
- <_AspNet31RuntimePackVersion>3.1.0-preview1.19508.20
- <_AspNet31TargetingPackVersion>$(_AspNet31RuntimePackVersion)
+ <_AspNet31RuntimePackVersion>3.1.0
+ <_AspNet31TargetingPackVersion>3.1.0
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 1d1c0d435..b074760f2 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -11,7 +11,7 @@
- $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)
+ $(VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion)
$(MicrosoftNETCoreAppInternalPackageVersion)
$(MicrosoftWindowsDesktopAppPackageVersion)
@@ -30,7 +30,7 @@
$(DOTNETCLIMSRC_READ_SAS_TOKEN)
https://dotnetclimsrc.blob.core.windows.net/dotnet/
- https://dotnetcli.azureedge.net/dotnet/
+ https://dotnetcli.blob.core.windows.net/dotnet/
https://dotnetclimsrc.blob.core.windows.net/dotnet/
https://dotnetcli.blob.core.windows.net/dotnet/
@@ -78,6 +78,7 @@
windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
$(SharedFrameworkRid)
+ linux-x64
$(AspNetCoreSharedFxInstallerRid)
x64
@@ -271,8 +272,7 @@
- $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)
- $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)
+ $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)
$(DownloadedAspNetTargetingPackInstallerFileName)
$(CoreSetupBlobAccessTokenParam)
diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
index cd75c251b..6e010c5ce 100644
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@@ -25,10 +25,12 @@
$(Rid)
$(OSName)-$(Architecture)
$(HostRid)
$(HostOSName)-$(Architecture)
$(HostMonikerRid)
diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets
index 268100720..52d64447a 100644
--- a/src/redist/targets/SetBuildDefaults.targets
+++ b/src/redist/targets/SetBuildDefaults.targets
@@ -15,6 +15,7 @@
true
true