- 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
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22057.1 to 1.0.0-beta.22065.1 (parent: Microsoft.DotNet.Arcade.Sdk)
- Remove source-build arcade patches that were backported
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- Microsoft.SourceLink.GitHub: from 1.2.0-beta-21629-02 to 1.2.0-beta-22056-02 (parent: Microsoft.DotNet.Arcade.Sdk)
- Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22055.1 to 1.0.0-beta.22057.1 (parent: Microsoft.DotNet.Arcade.Sdk)
- Remove Arcade source-build patch that was backported
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Test.Sdk: from 17.2.0-preview-20220105-03 to 17.2.0-preview-20220106-01 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 17.1.0-preview-22055-02 to 17.2.0-preview-22057-09 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
- Resolve msbuild patch conflict
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21617.2 to 7.0.100-alpha.1.21620.1 (parent: Microsoft.NET.Sdk)
- Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21617.2 to 7.0.100-alpha.1.21620.1 (parent: Microsoft.NET.Sdk)
- Remove obsolete sourcelink patch
It was merged upstream in https://github.com/dotnet/format/pull/1444
* Update dependencies from https://github.com/dotnet/sdk build 20211216.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.6
Dependency coherency updates
VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk
* Update dependencies from https://github.com/dotnet/sdk build 20211216.8
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.8
Dependency coherency updates
VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk
* Update dependencies from https://github.com/dotnet/sdk build 20211216.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.10
Dependency coherency updates
VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk
* Add logic to convert internal repo uris in version.details.xml (#12852)
* Add logic to convert internal repo uris in version.details.xml
* code review updates
* Remove source-build patches that we backported
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
* Exclude omnisharp tests from CentOS 7 CI
* Update src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
* Support source-build tarball creation w/internal repos
* Merged PR 19846: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.WindowsDesktop.App.Ref**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Ref**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Host.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.DotNetHostResolver**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.Platforms**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
- **dotnet-dev-certs**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
- **dotnet-user-secrets**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20211115.9
- **Date Produced**: November 15, 2021 7:50:53 PM UTC
- **Commit**: 7aff324297b3853a1cb198f92ec20f6bae9e2de5
- **Branch**: r...
* Merged PR 19997: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.WindowsDesktop.App.Ref**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20211118.7
- **Date Produced**: November 18, 2021 8:11:25 PM UTC
- **Commit**: a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
- **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.0 to 6.0.0][2]
- **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2][3]
- **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1][2]
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0de2b2e&targetVersion=GCa35d9cf&_a=files
[2]: ac655f0...59fea7d
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCac655f0&targetVersion=GCef15b55&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
* Merged PR 20001: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.Net.Compilers.Toolset**: from 4.0.0-6.21526.21 to 4.0.1-1.21568.1 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20211118.11
- **Date Produced**: November 18, 2021 10:53:09 PM UTC
- **Commit**: 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
- **Microsoft.Net.Compilers.Toolset**: [from 4.0.0-6.21526.21 to 4.0.1-1.21568.1][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa35d9cf&targetVersion=GC95eaa4d&_a=files
[2]: c7d6f9f...6ab6601
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21569.2 (parent: Microsoft.NET.Sdk)
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
