Commit graph

23572 commits

Author SHA1 Message Date
dotnet-bot
6c4aafad6a Merge in 'release/6.0.1xx' changes 2022-08-15 02:19:08 +00:00
v-wuzhai
c9b548453d
Merge pull request #14316 from dotnet/darc-release/6.0.1xx-c80065d0-1e6b-427f-97ec-c24ea9b081ad
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-08-14 19:07:07 -07:00
DotNet-Bot
68459c79bc Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220813.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22412.1 -> To Version 6.0.0-servicing.22413.1
2022-08-13 14:24:50 +00:00
DotNet Bot
21b25c7f29 [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 2022-08-12 23:05:20 +00:00
DotNet Bot
82c049ca1d [internal/release/6.0.3xx] Update dependencies from dotnet/arcade 2022-08-12 23:00:41 +00:00
DotNet Bot
fb29ac89d8 [internal/release/6.0.3xx] Update dependencies from dotnet/arcade 2022-08-12 17:57:30 +00:00
DotNet Bot
b6c55a0822 [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages 2022-08-12 17:56:01 +00:00
dotnet-maestro[bot]
ea0ac0d0d4 Update dependencies from https://github.com/dotnet/arcade build 20220811.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22314.7 -> To Version 6.0.0-beta.22411.3
2022-08-12 17:01:46 +00:00
dotnet-bot
b572ab0295 Merge in 'release/6.0.3xx' changes 2022-08-10 17:30:37 +00:00
Marc Paine
ce1faab52f
Merge pull request #14285 from vseanreesermsft/internal-merge-6.0.3xx-2022-08-09-1110
Merging internal commits for release/6.0.3xx
2022-08-10 10:19:13 -07:00
dotnet-bot
0d55a4feb3 Merge in 'release/6.0.3xx' changes 2022-08-10 06:13:10 +00:00
v-wuzhai
e2d1611b9b
Merge pull request #14293 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-09 23:01:49 -07:00
Jason Zhai
4045c96779 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-08-09 19:17:12 -07:00
dotnet-bot
bd1d685bd7 Merge in 'release/6.0.1xx' changes 2022-08-09 23:16:36 +00:00
NET Source-Build Bot
f2498acf16
update global.json and Versions.props for .NET SDK 6.0.108 (#14291) 2022-08-09 23:05:31 +00:00
dotnet-bot
4aac467538 Merge in 'release/6.0.3xx' changes 2022-08-09 21:16:48 +00:00
dotnet-bot
1dcefb8c8d Merge in 'release/6.0.1xx' changes 2022-08-09 21:15:51 +00:00
Marc Paine
1fa0da7fc4
Merge pull request #14289 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-09 14:06:31 -07:00
Marc Paine
feab66b98e
Merge pull request #14284 from vseanreesermsft/internal-merge-6.0.1xx-2022-08-09-1110
Merging internal commits for release/6.0.1xx
2022-08-09 14:03:14 -07:00
dotnet-bot
4fa8953451 Merge in 'release/6.0.1xx' changes 2022-08-09 19:39:57 +00:00
dotnet-bot
2f1b9a3693 Merge in 'release/6.0.3xx' changes 2022-08-09 19:39:55 +00:00
Doug Bunting
7268b5cff3
[6.0.3xx] Update template versions from dotnet/aspnetcore (#14244) 2022-08-09 19:27:54 +00:00
Doug Bunting
c4fc9114a7
[6.0.1xx] Update template versions from dotnet/aspnetcore (#14243) 2022-08-09 19:27:40 +00:00
Sean Reeser
ee223bf3b9 Merge commit '7494fee64a69205fea68f86f541db829c3b82384' into internal-merge-6.0.3xx-2022-08-09-1110 2022-08-09 11:10:21 -07:00
Sean Reeser
9927e69501 Merge commit '4e3a463d2b2ad382a04bdf570e9154c8ec7fe37e' into internal-merge-6.0.1xx-2022-08-09-1110 2022-08-09 11:10:12 -07:00
dotnet-bot
c2e0f93753 Merge in 'release/6.0.3xx' changes 2022-08-05 22:59:54 +00:00
Marc Paine
372935eab6
Merge pull request #14268 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-05 15:48:17 -07:00
dotnet-bot
30b2b213b4 Merge in 'release/6.0.1xx' changes 2022-08-05 19:37:11 +00:00
Michael Simons
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
dotnet-bot
c08e01c771 Merge in 'release/6.0.3xx' changes 2022-08-02 22:06:04 +00:00
Marc Paine
4113612ee8
Merge pull request #14241 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-02 14:56:31 -07:00
dotnet-bot
f058b9477d Merge in 'release/6.0.1xx' changes 2022-08-02 19:58:38 +00:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Marc Paine
8c3b1d2045
Revert branding 2022-08-02 12:54:22 -07:00
Marc Paine
7132adc319
Merge pull request #14152 from dotnet/marcpopMSFT-updatemacosimage
Update MacOS image
2022-08-02 12:50:20 -07:00
Marc Paine
9438d7ec6f
Merge pull request #14214 from dotnet/marcpopMSFT-fix50templateversion
Fix the 5.0 wpf/winforms template versions
2022-08-02 12:47:45 -07:00
Marc Paine
b873af05ec
Merge pull request #14234 from vseanreesermsft/branding-6.0.109-2022-08-02-0918
Update branding to 6.0.109
2022-08-02 12:46:55 -07:00
dotnet-bot
5a396439db Merge in 'release/6.0.3xx' changes 2022-08-02 18:09:37 +00:00
Marc Paine
978fee91b6
Merge pull request #14235 from vseanreesermsft/branding-6.0.304-2022-08-02-0918
Update branding to 6.0.304
2022-08-02 10:56:20 -07:00
Sean Reeser
f66d2fea34 Update branding to 6.0.304 2022-08-02 09:18:15 -07:00
Sean Reeser
d7230fb9bd Update branding to 6.0.109 2022-08-02 09:18:10 -07:00
Marc Paine
cf729ea84f Fix the 6.0 WD template bundles to use the 6.0 templates. 2022-07-28 13:34:38 -07:00
Marc Paine
10cd2639da
Update Versions.props 2022-07-28 10:02:41 -07:00
Chris Rummel
4e3a463d2b Merged PR 24267: Revert CoherentParentDependency and fix version of source-build externals 2022-07-20 00:21:19 +00:00
DotNet Bot
7494fee64a Merged PR 24233: [internal/release/6.0.3xx] 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.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220718.20
- **Date Produced**: July 18, 2022 9:40:52 PM UTC
- **Commit**: c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.303-servicing.22368.13 to 6.0.303-servicing.22368.20][1]
  - **Microsoft.NET.Sdk**: [from 6.0.303-servicing.22368.13 to 6.0.303-servicing.22368.20][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC79a32c0&targetVersion=GCc42e5eb&_a=files
[2]: https://dev.azure.com/dnceng/internal/...
2022-07-18 22:23:02 +00:00
DotNet Bot
486395280b Merged PR 24232: [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.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (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**: 20220718.19
- **Date Produced**: July 18, 2022 9:38:19 PM UTC
- **Commit**: 17ea4a71a1adac805a17c272977139ddc6200bf9
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1]
  - **Microsoft.NET.Sdk**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a42b2d&targetVersion=GC17ea4a7&_a=files
[2]: https://dev.azure.com/dnceng/internal/_g...
2022-07-18 22:22:57 +00:00
DotNet Bot
398f5e48ab Merged PR 24229: [internal/release/6.0.3xx] 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.303 to 6.0.303 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.303-servicing.22363.25 to 6.0.303-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.303 to 6.0.303 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220718.13
- **Date Produced**: July 18, 2022 7:32:12 PM UTC
- **Commit**: 79a32c021d4e3df6f87a3f92b159820aabd7fd62
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.303-servicing.22368.10 to 6.0.303-servicing.22368.13][1]
  - **Microsoft.NET.Sdk**: [from 6.0.303-servicing.22368.10 to 6.0.303-servicing.22368.13][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.303 to 6.0.303][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.303-servicing.22363.25 to 6.0.303-servicing.22368.4][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.303 to 6.0.303][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0aab604&targetVersion=GC79a32c0&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC64dbf39&targetVersion=GCd251862&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-07-18 20:21:02 +00:00
DotNet-Bot
0045a485a6 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220718.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.303-servicing.22368.10 -> To Version 6.0.303-servicing.22368.13

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.303 -> To Version 6.0.303 (parent: Microsoft.NET.Sdk
2022-07-18 20:01:46 +00:00
DotNet Bot
060275cd0b [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.NETCore.Platforms: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
2022-07-18 18:57:07 +00:00
DotNet Bot
f18b980dc0 Merged PR 24216: [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.Platforms**: from 6.0.5 to 6.0.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**: 20220718.7
- **Date Produced**: July 18, 2022 4:59:28 PM UTC
- **Commit**: 5a42b2d13276bc8f012a09589ad13842cb2e14d7
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.108-servicing.22364.10 to 6.0.108-servicing.22368.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.108-servicing.22364.10 to 6.0.108-servicing.22368.7][1]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7ee6a81&targetVersion=GC5a42b2d&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf316191&targetVersion=GC0ec02c8&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-07-18 18:50:10 +00:00