Commit graph

9149 commits

Author SHA1 Message Date
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
dotnet-bot
c08e01c771 Merge in 'release/6.0.3xx' changes 2022-08-02 22:06:04 +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
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
dotnet-bot
5a396439db Merge in 'release/6.0.3xx' changes 2022-08-02 18:09:37 +00: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
10cd2639da
Update Versions.props 2022-07-28 10:02:41 -07: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
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
a5f447c419 Merged PR 24111: [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.22356.2 to 6.0.8-servicing.22363.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22356.2 to 6.0.8-servicing.22363.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.8-servicing.22356.4 to 6.0.8-servicing.22363.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.8-servicing.22356.4 to 6.0.8-servicing.22363.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.8-servicing.22356.15 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.8-servicing.22356.15 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.8-servicing.22356.15 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.8-servicing.22356.15 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.303 to 6.0.303 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.303-servicing.22358.5 to 6.0.303-servicing.22363.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.303 to 6.0.303 (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.7-servicing.22322.3 to 6.0.8-servicing.22363.7 (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**: ...
2022-07-14 23:40:30 +00:00
DotNet-Bot
9a230f07c9 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220714.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.303-servicing.22362.9 -> To Version 6.0.303-servicing.22364.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,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
 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-14 17:17:33 +00:00
dotnet-bot
80eab03144 Merge in 'release/6.0.3xx' changes 2022-07-13 22:56:01 +00:00
Marc Paine
356e832251
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-13 11:45:16 -07:00
DotNet-Bot
b1eed85a65 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220713.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.303-servicing.22362.9 -> To Version 6.0.303-servicing.22363.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,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.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-13 17:12:46 +00:00
NET Source-Build Bot
3c4e56a00a
update global.json and Versions.props for .NET SDK 6.0.107 (#14121) 2022-07-13 09:23:43 -07:00
DotNet-Bot
5334c3f76c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.303-servicing.22358.14 -> To Version 6.0.303-servicing.22362.9
2022-07-12 20:57:27 +00:00
dotnet-bot
4f2c281cf7 Merge in 'release/6.0.3xx' changes 2022-07-12 19:22:06 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
William Godbe
853275fdcb
Update Asp.Net template (#14111) 2022-07-12 12:13:55 -07:00
Will Godbe
23a55e8341 Merge commit 'f6ec7508e3b20ad6fbc4ffa8ea4ed8818ffccc1d' into internal-merge-6.0.1xx-2022-07-12-1057 2022-07-12 10:57:21 -07:00
Will Godbe
4d81493240 Merge commit 'c857713418e715e1ca1a5c9fa5c360aaf71d2231' into internal-merge-6.0.3xx-2022-07-12-1057 2022-07-12 10:57:14 -07:00
Marc Paine
fcac10b492
Merge pull request #14082 from mmitche/branding-6.0.303-2022-07-05-1230
Update branding to 6.0.303
2022-07-12 09:17:07 -07:00
DotNet-Bot
d384f3f5f7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220708.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22358.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.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.Ref,Microsoft.AspNetCore.App.Ref.Internal,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-09 00:56:00 +00:00
Marc Paine
af4b8739b3 run update dependencies. This may conflict when it tries to merge internally though 2022-07-06 16:49:00 -07:00
DotNet-Bot
25bd4e7cbb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.21

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22274.4 -> To Version 12.0.4-beta.22329.1 (parent: Microsoft.NET.Sdk
2022-07-06 22:48:10 +00:00
DotNet-Bot
2b4cdefbd1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.2
2022-07-06 08:20:55 +00:00
DotNet-Bot
995f7cd6e2 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22355.5
2022-07-05 22:39:42 +00:00
Matt Mitchell
da15ec1396 Update branding to 6.0.303 2022-07-05 12:30:19 -07:00
Matt Mitchell
0e6c0b83d5 Update branding to 6.0.108 2022-07-05 12:30:15 -07:00
DotNet-Bot
18f002dda7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22322.21 -> To Version 6.0.302-servicing.22323.12

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,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
 From Version 6.0.7 -> To Version 6.0.7 (parent: Microsoft.NET.Sdk
2022-06-23 19:44:03 +00:00
DotNet-Bot
5ddc14fb7c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.107-servicing.22322.34 -> To Version 6.0.107-servicing.22323.13

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.107 -> To Version 6.0.107 (parent: Microsoft.NET.Sdk
2022-06-23 19:39:12 +00:00
DotNet-Bot
421de59ba8 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22322.21 -> To Version 6.0.302-servicing.22323.5

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets
 From Version 6.0.7 -> To Version 6.0.7 (parent: Microsoft.NET.Sdk
2022-06-23 16:19:37 +00:00
DotNet Bot
6a808a4c48 Merged PR 23715: [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.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.7-servicing.22314.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.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**: 20220622.34
- **Date Produced**: June 23, 2022 5:04:19 AM UTC
- **Commit**: 336044192d20c6c49968ffc53bbc8ca363bd94e8
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5]
  - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.7 to 6.0.7][6]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22321.2 to 6.0.7-servicing.2...
2022-06-23 14:52:37 +00:00
DotNet Bot
e0cc63f11d Merged PR 23697: [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.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300 to 6.0.302 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.300-rtm.22215.5 to 6.0.302-servicing.22321.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300 to 6.0.302 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (pa...
2022-06-22 23:43:34 +00:00
DotNet Bot
beddbdec0a Merged PR 23696: [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.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22268.6 to 6.0.107-servicing.22315.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22314.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22268.4 to 6.0.7-servicing.22321.2 (parent:...
2022-06-22 21:39:15 +00:00
DotNet Bot
ed49dd9da1 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 6.0.2-rc.3 to 6.0.2-rc.5 (parent: Microsoft.NET.Sdk)
2022-06-22 17:38:16 +00:00
DotNet Bot
3eff7cb90a Merged PR 23544: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20220614.7
- **Date Produced**: June 14, 2022 8:03:55 PM UTC
- **Commit**: fdd3a242bc813f371023adff4e4c05c0be705d2a
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1]
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1]

[1]: e3cbecc...fdd3a24

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.106

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2022-06-20 22:39:55 +00:00
Matt Mitchell
569e5c6ec6
Merge pull request #13968 from vseanreesermsft/internal-merge-6.0.1xx-2022-06-14-1030
Merging internal commits for release/6.0.1xx
2022-06-15 12:15:14 -07:00
Matt Mitchell
75d4c37cea
Merge pull request #13969 from vseanreesermsft/internal-merge-6.0.3xx-2022-06-14-1031
Merging internal commits for release/6.0.3xx
2022-06-15 12:14:59 -07:00
NET Source-Build Bot
564757c6a5
.NET Source-Build 6.0.106 June 2022 Updates (#13978)
* update global.json and Versions.props for .NET SDK 6.0.106

* Fix Versions.props

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-06-15 06:07:50 +00:00
dotnet-maestro[bot]
353bef46e2 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:48:03 +00:00
dotnet-bot
88bffe07a9 Merge in 'release/6.0.3xx' changes 2022-06-14 19:26:16 +00:00
William Godbe
c6cc5179c7
Update Asp.Net template (#13964) 2022-06-14 12:09:13 -07:00
William Godbe
9a4017803e
Update asp.net template (#13965) 2022-06-14 12:09:07 -07:00
Sean Reeser
dc1bc88432 Merge commit '43f9b184817e4f48ba091d068a4d517c86daafd3' into internal-merge-6.0.3xx-2022-06-14-1031 2022-06-14 10:31:06 -07:00
Sean Reeser
caa27c6ae0 Merge commit 'e83a22f55807cbb06f22f80426ed4997c9e82822' into internal-merge-6.0.1xx-2022-06-14-1030 2022-06-14 10:30:57 -07:00