Commit graph

22925 commits

Author SHA1 Message Date
dotnet-bot
1dcefb8c8d Merge in 'release/6.0.1xx' changes 2022-08-09 21:15:51 +00: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
Doug Bunting
c4fc9114a7
[6.0.1xx] Update template versions from dotnet/aspnetcore (#14243) 2022-08-09 19:27:40 +00: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
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
f058b9477d Merge in 'release/6.0.1xx' changes 2022-08-02 19:58:38 +00: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
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
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
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
DotNet-Bot
a1f9d557b3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220718.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22364.10 -> To Version 6.0.108-servicing.22368.7

Dependency coherency updates

Microsoft.NETCore.Platforms
 From Version 6.0.5 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-07-18 17:27:05 +00:00
Marc Paine
9b8f47e0f2
Update .vsts-ci.yml 2022-07-15 13:07:12 -07:00
DotNet Bot
d12cf74ec8 Merged PR 24155: [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.22362.4 to 6.0.8-servicing.22363.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22362.4 to 6.0.8-servicing.22363.10 (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.22362.13 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.22363.5 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.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.8-servicing.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.8-servicing.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.108 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.108-servicing.22363.6 to 6.0.108-servicing.22363.24 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.108 to 6.0.108 (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**: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22363.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.Sha...
2022-07-14 22:33:58 +00:00
DotNet-Bot
97180e68eb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220714.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22363.15 -> To Version 6.0.108-servicing.22364.10

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-14 17:18:47 +00:00
DotNet Bot
969e4e4f78 Merged PR 24112: [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.22356.2 to 6.0.8-servicing.22362.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22356.2 to 6.0.8-servicing.22362.4 (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.22362.13 (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.5 (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.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.8-servicing.22356.15 to 6.0.8-servicing.22363.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.8-servicing.22356.15 to 6.0.8-servicing.22363.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.108 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.108-servicing.22356.5 to 6.0.108-servicing.22363.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.108 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.8-servicing.22356.4 to 6.0.8-servicing.22362.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.source-build**: from 6.0.0-servicing.22320.1 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[m...
2022-07-14 16:45:23 +00:00
DotNet-Bot
f3889c2c22 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220713.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22362.8 -> To Version 6.0.108-servicing.22363.15

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build
 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-13 17:15:16 +00:00
dotnet-bot
e7a8800626 Merge in 'release/6.0.1xx' changes 2022-07-13 16:39:44 +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
ca65bae51f Merged PR 24044: [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.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22356.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22356.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22356.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.107 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.107-servicing.22323.7 to 6.0.108-servicing.22356.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.107 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22356.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.source-build**: from 6.0.0-servicing.22320.1 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NE...
2022-07-12 23:57:11 +00:00
DotNet-Bot
23560d61e3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22355.10 -> To Version 6.0.108-servicing.22362.8

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-12 20:53:11 +00:00
dotnet-bot
834af7b5f3 Merge in 'release/6.0.1xx' changes 2022-07-12 19:21:53 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
Marc Paine
7bc522bbb6
Merge pull request #14115 from wtgodbe/internal-merge-6.0.1xx-2022-07-12-1057
Merging internal commits for release/6.0.1xx
2022-07-12 12:10:27 -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
DotNet-Bot
be25e9cf89 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220711.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22355.10 -> To Version 6.0.108-servicing.22361.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-12 00:07:18 +00:00
DotNet Bot
6d466e5903 Merged PR 23894: [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**: 20220705.10
- **Date Produced**: July 5, 2022 11:43:51 PM UTC
- **Commit**: 7f5abe2c7c62767d67bdcd81f9b1cd9e788fdf0d
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22323.13 to 6.0.108-servicing.22355.10][1]
  - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22323.13 to 6.0.108-servicing.22355.10][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-07-08 23:51:13 +00:00
DotNet-Bot
f94f58591a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.107-servicing.22323.13 -> To Version 6.0.108-servicing.22355.10
2022-07-06 00:09:57 +00:00
Marc Paine
0479ac2dc2
Merge pull request #14081 from mmitche/branding-6.0.108-2022-07-05-1230
Update branding to 6.0.108
2022-07-05 13:33:06 -07:00
Matt Mitchell
0e6c0b83d5 Update branding to 6.0.108 2022-07-05 12:30:15 -07:00
Logan Bussell
4df698566f
Add more detailed source-build instructions to README (#14038)
* Add more detailed source-build instructions to README

* Add support information
2022-06-27 22:23:17 +00:00
DotNet Bot
f6ec7508e3 Merged PR 23735: [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.107 to 6.0.107 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.107-servicing.22315.9 to 6.0.107-servicing.22323.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.107 to 6.0.107 (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**: 20220623.13
- **Date Produced**: June 23, 2022 7:08:47 PM UTC
- **Commit**: ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22322.34 to 6.0.107-servicing.22323.13][1]
  - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22322.34 to 6.0.107-servicing.22323.13][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.107 to 6.0.107][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.107-servicing.22315.9 to 6.0.107-servicing.22323.7][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.107 to 6.0.107][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3360441&targetVersion=GCddd1981&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCd168d16&targetVersion=GCd7124c6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-06-23 19:47:47 +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
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
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
Chris Rummel
138bc32cd9
[source-build] [release/6.0.1xx] Additional changes to make the tarball commitable. (#14004)
* Additional changes to make the tarball commitable.
- Add an empty file so an empty packages/prebuilt directory is not removed (NuGet depends on all file sources existing even if empty).
- Use version of source-build-externals with fix for patching in a broken git repo.
- Delete `objects` directory from submodule .gitdirs.

* Enable work-tree and unsafe-paths for repo-level patches to be able to apply in the checked-in tarball.

* Update src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-06-22 20:33:09 +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
Chris Rummel
898bfe7356
Fixups to make the tarball committable (#13894) 2022-06-15 17:52:57 -05: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
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
v-wuzhai
ef4c352c92
Merge pull request #13982 from dotnet/darc-release/6.0.1xx-e7e2a401-5a42-485b-927a-257e3456d809
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-06-14 22:40:33 -07:00
v-wuzhai
61febc0ff7
Merge pull request #13984 from dotnet/darc-release/6.0.1xx-2d70cfad-1cbf-4ad7-9851-d1d3fcf05278
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-14 22:39:14 -07:00
dotnet-maestro[bot]
e3cd1424a0 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22309.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:02 +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