- Resolve source-build patch conflicts
- Remove source-build runtime patch that was backported
- Merge branch 'internal/release/6.0.1xx' of https://dnceng.visualstudio.com/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679
- Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9
- Download bits from dotnetbuilds/internal
- Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9
- Merge remote-tracking branch 'dnceng/internal/release/6.0.1xx' into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679
* Switch another leg to Ubuntu 18
* Switch to Ubuntu 18
* Also update source build queues to Ubuntu 18
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21463.2 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21463.2 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21461.3 to 6.0.0-rtm.21466.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21466.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21471.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 17.0.0-preview-21463-01 to 17.0.0-preview-21470-01 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 6.0.0-preview.4.243 to 6.0.0-rc.244 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21451.1 to 6.0.0-rc.2.21464.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)
- Porting Vlada's change from https://github.com/dotnet/installer/pull/11981 over into 6.0.1xx as it's needed in this PR.
- Disable test execution for the ES leg for now as it's triggering failures that will take time to investigate if we decide we want to keep this leg: https://dev.azure.com/dnceng/public/_build/results?buildId=1375668&view=ms.vss-test-web.build-test-results-tab