Commit graph

8768 commits

Author SHA1 Message Date
Sean Reeser
5fcd191cd0 Update branding to 6.0.107 2022-06-07 10:00:12 -07:00
Doug Bunting
ee1b7085a6
[6.0.1xx] Update template versions from dotnet/aspnetcore (#13839) 2022-05-13 14:24:13 -07:00
dotnet-maestro[bot]
e01c18dae4
Update dependencies from https://github.com/dotnet/arcade build 20220511.7 (#13836)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22254.3 -> To Version 6.0.0-beta.22261.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-12 11:16:09 -07:00
NET Source-Build Bot
9fe7aa2179
update global.json and Versions.props for .NET SDK 6.0.105 (#13821) 2022-05-11 04:25:00 +00:00
vseanreesermsft
72a85dfc6a
Merging internal commits for release/6.0.1xx (#13812)
* Merged PR 22398: [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.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.104-servicing.22164.8 to 6.0.105-servicing.22214.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.0.1-1.22157.22 to 4.0.1-1.22181.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a68e208b-7b...

* Merged PR 22415: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220418.14
- **Date Produced**: April 18, 2022 10:36:29 PM UTC
- **Commit**: e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7882da0&targetVersion=GCe910b87&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 22459: Update source-build to AspNetCoreSharedFxInstallerRid property rename

AspNetCoreSharedFxInstallerRid was renamed to AspNetCoreInstallerRid in 7ce479f5e7.

* Merged PR 22507: [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.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20220420.15
- **Date Produced**: April 20, 2022 5:24:23 PM UTC
- **Commit**: 0ad59d00ed13d3b5cd1343efb4dde64714f70063
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe910b87&targetVersion=GC0ad59d0&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0636f1e&targetVersion=GCad94063&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfcb07d6&targetVersion=GC14bf2e5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208...

* Merged PR 22538: [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.AspNetCore.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (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**: 20220421.11
- **Date Produced**: April 21, 2022 4:12:47 PM UTC
- **Commit**: ce948f426d1c884d4a7315bd4d745590a797bd48
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0ad59d0&targetVersion=GCce948f4&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
2022-05-10 17:36:26 -07:00
dotnet-maestro[bot]
a1dc2f68e4 Update dependencies from https://github.com/dotnet/arcade build 20220504.3
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3
2022-05-04 21:19:18 +00:00
Sean Reeser
5a1062a005 Update branding to 6.0.106 2022-05-03 10:28:19 -07:00
dotnet-maestro[bot]
5ac5af9b48
Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#13619)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-13 08:54:04 -07:00
Matt Mitchell
40f5222a0d
Merge pull request #13602 from vseanreesermsft/internal-merge-6.0.1xx-2022-04-12-1157
Merging internal commits for release/6.0.1xx
2022-04-13 07:47:09 -07:00
NET Source-Build Bot
8d32713c4e
update global.json and Versions.props for .NET SDK 6.0.104 (#13607) 2022-04-13 00:36:01 +00:00
William Godbe
aca24a9b5a
[6.0.1xx] Update asp.net template versions (#13543) 2022-04-12 20:27:03 +00:00
Marc Paine
608561c76d
Merge pull request #13533 from vseanreesermsft/branding-6.0.105-2022-04-05-1258
Update branding to 6.0.105
2022-04-12 12:04:31 -07:00
Sean Reeser
72e5a349ae Merge commit '915d644e451858f4f7c6e1416ea202695ddd54fb' into internal-merge-6.0.1xx-2022-04-12-1157 2022-04-12 11:57:14 -07:00
dotnet-maestro[bot]
37650d170d Update dependencies from https://github.com/dotnet/arcade build 20220406.7
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22178.5 -> To Version 6.0.0-beta.22206.7
2022-04-07 15:41:35 +00:00
dotnet-maestro[bot]
b502cab94e Update dependencies from https://github.com/dotnet/arcade build 20220328.5
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5
2022-04-05 20:21:46 +00:00
Sean Reeser
4a89f33d29 Update branding to 6.0.105 2022-04-05 12:58:57 -07:00
DotNet Bot
915d644e45 Merged PR 21937: [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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (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**: 20220322.6
- **Date Produced**: March 22, 2022 6:16:01 PM UTC
- **Commit**: 50e695e438ba9f826633d4127d891d53fd972314
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.104-servicing.22171.26 to 6.0.104-servicing.22172.6][1]
  - **Microsoft.NET.Sdk**: [from 6.0.104-servicing.22171.26 to 6.0.104-servicing.22172.6][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC53f7e9b&targetVersion=GC50e695e&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-03-22 19:04:48 +00:00
DotNet Bot
22cdfa11a3 Merged PR 21924: [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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (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**: 20220321.26
- **Date Produced**: March 21, 2022 11:47:29 PM UTC
- **Commit**: 53f7e9bf207e1a7bbe8253692a2087d42f549e18
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.104-servicing.22168.3 to 6.0.104-servicing.22171.26][1]
  - **Microsoft.NET.Sdk**: [from 6.0.104-servicing.22168.3 to 6.0.104-servicing.22171.26][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC50891b8&targetVersion=GC53f7e9b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-03-22 00:19:13 +00:00
DotNet Bot
10e0e1e567 Merged PR 21560: [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.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22123.6 to 6.0.104-servicing.22164.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22124.2 to 6.0.4-servicing.22165.3 (parent:...
2022-03-21 01:07:52 +00:00
dotnet-maestro[bot]
6b3f3a8f02 Update dependencies from https://github.com/dotnet/arcade build 20220311.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1
2022-03-12 00:40:30 +00:00
Marc Paine
e25c681f60
Merge pull request #13386 from dotnet/darc-release/6.0.1xx-83ad0b2e-e526-47dd-b6af-b6b0276aade9
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-03-10 14:00:23 -08:00
dotnet-maestro[bot]
1d02c2b774 Update dependencies from https://github.com/dotnet/arcade build 20220309.8
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8
2022-03-10 18:30:46 +00:00
MichaelSimons
ca2b7c8cbe Update source-build with 6.0.103 artifacts 2022-03-10 00:19:52 +00:00
Doug Bunting
519f6dc513
[6.0.1xx] Bump aspnetcore template versions (#13365) 2022-03-09 12:20:55 -08:00
vseanreesermsft
08f3930ac3
Merging internal commits for release/6.0.1xx (#13347)
* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22115.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.2-servicing.22064.8 to 6.0.3-servicing.22115.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22053.6 to 4.0.1-1.22114.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.102 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.102-servicing.22068.7 to 6.0.103-servicing.22116.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22114.6 to 4.0.1-1.22116.5 (parent: Microsoft.NET.Sdk)

 - Remove source-build aspnetcore patch to always build targeting packs because the backported fix is flowing in

* Merged PR 21331: Add runtime patch to reference correct System.Reflection.MetadataLoadContext version

System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build.
In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking
the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion.

* Merged PR 21346: [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.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (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**: 20220221.9
- **Date Produced**: February 21, 2022 7:09:27 PM UTC
- **Commit**: 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.103 to 6.0.103][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.103 to 6.0.103][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbecb321&targetVersion=GC3d6f35b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC488cbc4&targetVersion=GC988d95c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 21441: [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.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22121.10 to 6.0.103-servicing.22123.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (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**: 20220224.11
- **Date Produced**: February 24, 2022 8:11:47 PM UTC
- **Commit**: 574686d9d185bd75770481fa76a82a0871210af4
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3]
  - **Microsoft.NETCor...

* Merged PR 21459: [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.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20220224.18
- **Date Produced**: February 24, 2022 10:36:20 PM UTC
- **Commit**: 36d5c10d65ec7577234f1b72c25e21b9512f1895
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.3 to 6.0.3][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC67f3050&targetVersion=GC36d5c10&_a=files
[2]: https://dev.azure.com/dnceng/intern...

* Update to temp SBRP version.

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
2022-03-09 08:34:39 -06:00
dotnet-maestro[bot]
0dc1d1a48f
[release/6.0.1xx] Update dependencies from dotnet/arcade (#13312)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-04 19:42:04 -06:00
Sean Reeser
30bbc7d8e3 Update branding to 6.0.104 2022-03-01 10:55:28 -08:00
Chris Rummel
606bca49cb
Update to SDK and previously-source-built 6.0.102. (#13221) 2022-02-15 03:12:25 +00:00
vseanreesermsft
69bd1f865f
Merge pull request #13189 from vseanreesermsft/internal-merge-6.0.1xx-2022-02-08-1019
Merging internal commits for release/6.0.1xx
2022-02-09 10:28:35 -08:00
William Godbe
ee9b80739f
Update asp.net templates (#13193) 2022-02-08 16:30:48 -08:00
Sean Reeser
2186b8b250 Merge commit '02d5242ed7ca7c3747fc89196cf67aeff260c6ac' into internal-merge-6.0.1xx-2022-02-08-1019 2022-02-08 10:19:26 -08:00
dotnet-maestro[bot]
b86d04b65d
Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13186)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-02-08 08:22:22 -08:00
dotnet-maestro[bot]
701b7698d6
Update dependencies from https://github.com/dotnet/arcade build 20220202.3 (#13164)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-02-03 17:55:02 +00:00
vseanreesermsft
041c2d6658
Update branding to 6.0.103 (#13156) 2022-02-01 14:09:57 -08:00
Michael Simons
4a1e7f6238
Update source-build toolset and artifacts to 6.0.1 (#12860)
* Update source-build toolset and artifacts to 6.0.1

* Update PrivateSourceBuiltArtifactsPackageVersion
2022-01-20 09:58:43 -06:00
DotNet Bot
02d5242ed7 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- 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
2022-01-19 18:34:20 +00:00
dotnet-bot
94d5ff8aad Merge in 'release/6.0.1xx' changes 2022-01-14 20:38:04 +00:00
dotnet-maestro[bot]
d31aa165db
Update dependencies from https://github.com/dotnet/test-templates build 20220114.3 (#13051)
[release/6.0.1xx] Update dependencies from dotnet/test-templates
2022-01-14 20:37:03 +00:00
Matt Mitchell
f58d51e6ae
Merging internal commits for release/6.0.1xx (#12827)
* 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>
2021-12-15 16:21:31 -08:00
DotNet Bot
a6432496b0 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-15 02:42:14 +00:00
dotnet-bot
16b964c975 Merge in 'release/6.0.1xx' changes 2021-12-14 23:23:33 +00:00
William Godbe
9b9ab15577
Update asp.net template versions (#12764) 2021-12-14 23:22:30 +00:00
dotnet-bot
fd122a4e52 Merge in 'release/6.0.1xx' changes 2021-12-14 19:56:36 +00:00
dotnet-maestro[bot]
4de9f12e2e
Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12837)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2021-12-14 19:55:22 +00:00
Sean Reeser
2c5af44dde Merge commit 'ef49f6213a0256d5e8b10d9a573f8dd355bc8593' into internal-merge-6.0.1xx-2021-12-14-0946 2021-12-14 09:46:54 -08:00
DotNet Bot
e88edad0ea [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-14 08:43:37 +00:00
DotNet Bot
c8a4f55c85 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-11 01:53:10 +00:00
dotnet-bot
049b07e5c0 Merge in 'release/6.0.1xx' changes 2021-12-07 19:32:17 +00:00
vseanreesermsft
a58ef7bebe
Update branding to 6.0.102 (#12761) 2021-12-07 10:31:37 -08:00
DotNet Bot
769ba58be1 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-07 00:13:42 +00:00