Commit graph

23622 commits

Author SHA1 Message Date
Sean Reeser
f5fae21d12 Merge commit '7771abd614f31fa87deb013fdde3e590495a0c56' into internal-merge-6.0.4xx-2022-08-09-1110 2022-08-09 11:10:29 -07:00
Marc Paine
063d79ea3e
Merge pull request #14270 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-08-08 15:51:27 -07:00
Marc Paine
16df0cb2b2
Merge pull request #14182 from dotnet/darc-release/6.0.4xx-aad6e795-4562-4ce8-b1b6-b44b2ab82baf
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-08-08 15:49:43 -07: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
Michael Simons
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
dotnet-maestro[bot]
4514a2a032 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220805.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22405.1
2022-08-05 14:28:27 +00:00
dotnet-maestro[bot]
807fbf16c4 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220804.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22404.1
2022-08-04 15:01:09 +00:00
Marc Paine
a55a0d2fba
Merge pull request #14247 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-08-02 18:29:20 -07:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
Marc Paine
8dcf8232d7
Merge pull request #14236 from vseanreesermsft/branding-6.0.401-2022-08-02-0918
Update branding to 6.0.401
2022-08-02 15:33:45 -07: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
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
Marc Paine
7046244198
Servicing label 2022-08-02 12:45:21 -07: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
fdea79d106 Update branding to 6.0.401 2022-08-02 09:18:19 -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
dotnet-maestro[bot]
d7a4d67024 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220728.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22378.1
2022-07-28 14:53:29 +00:00
dotnet-maestro[bot]
a6eb5ad33e Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220727.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22377.1
2022-07-27 15:04:08 +00:00
dotnet-maestro[bot]
f6d8ed6077 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220722.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22372.1
2022-07-22 15:45:39 +00:00
dotnet-bot
7771abd614 Merge in 'release/6.0.4xx' changes 2022-07-21 18:12:09 +00:00
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
dotnet-maestro[bot]
f2596c2ac9 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220720.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22370.1
2022-07-20 15:27:24 +00:00
DotNet Bot
146342f407 Merged PR 24234: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20220718.21
- **Date Produced**: July 18, 2022 9:43:20 PM UTC
- **Commit**: 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.400-rtm.22367.6 to 6.0.400-rtm.22368.21][1]
  - **Microsoft.NET.Sdk**: [from 6.0.400-rtm.22367.6 to 6.0.400-rtm.22368.21][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=GC4289799&targetVersion=GC533f5a2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop...
2022-07-18 22:23:06 +00:00
DotNet Bot
cbfb7bf2d3 Merged PR 24204: [internal/release/6.0.4xx] 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.3.0-3.22363.19 to 4.3.0-3.22365.10 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20220717.6
- **Date Produced**: July 18, 2022 4:11:01 AM UTC
- **Commit**: 428979958ee5fb06d88b45746a7bdb5985df1246
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.400-rtm.22365.19 to 6.0.400-rtm.22367.6][1]
  - **Microsoft.NET.Sdk**: [from 6.0.400-rtm.22365.19 to 6.0.400-rtm.22367.6][1]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.3.0-3.22363.19 to 4.3.0-3.22365.10][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCec1808f&targetVersion=GC4289799&_a=files
[2]: 8b86c20...dd078d4

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2022-07-18 18:50:03 +00:00
DotNet-Bot
7b317fc1e0 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220717.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22365.19 -> To Version 6.0.400-rtm.22367.6

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22363.19 -> To Version 4.3.0-3.22365.10 (parent: Microsoft.NET.Sdk
2022-07-18 04:37:00 +00:00
DotNet Bot
a5bbf0c149 Merged PR 24182: [internal/release/6.0.4xx] 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.22363.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22363.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22363.6 (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.22363.6 (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.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.22363.16 (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.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.400-preview.22358.2 to 6.0.400 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.400-preview.22358.2 to 6.0.400-rtm.22364.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.400-preview.22358.2 to 6.0.400 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 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.7 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf....
2022-07-16 00:45:10 +00:00
DotNet-Bot
a350ed8b1d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.19

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,Microsoft.Build
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-15 23:31:21 +00:00
Marc Paine
9b8f47e0f2
Update .vsts-ci.yml 2022-07-15 13:07:12 -07:00
DotNet-Bot
1a93c8b6eb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.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,Microsoft.Build
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-15 19:40:37 +00:00
Marc Paine
7a5b36b4a4
Merge pull request #13851 from dotnet/darc-release/6.0.4xx-6a07086d-2076-46c3-8687-e9435a81260c
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-07-14 16:33:24 -07:00
Marc Paine
9b9fc6cf97
Merge pull request #14144 from dotnet/marcpopMSFT-stabilizebranding
Stabilize branding and implicit version
2022-07-14 14:25:07 -07:00
Marc Paine
6e22d938ef
Update to target 3.1.28 2022-07-14 11:13:38 -07:00
Marc Paine
5cb321b875
Update Versions.props 2022-07-14 11:12:45 -07:00
Marc Paine
5c9d59d43b
Merge pull request #14134 from dotnet/marcpopMSFT-fixzipinstallsformanifestbands
Install the manifests into their specific feature band rather than the current band
2022-07-14 10:47:37 -07:00
Grace Kulin
c48a826bfc
Merge pull request #14141 from dotnet/darc-release/6.0.4xx-4000ba6c-74ad-4be1-a376-980625e483d5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-14 08:07:10 -07:00
dotnet-maestro[bot]
9cec012147 Update dependencies from https://github.com/dotnet/sdk build 20220714.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.52 -> To Version 6.0.400-preview.22364.3

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.19 (parent: Microsoft.NET.Sdk
2022-07-14 10:00:27 +00:00
v-wuzhai
5104cb81e0
Merge pull request #14139 from dotnet/darc-release/6.0.4xx-a3d99b10-a76d-441e-86d6-e1045916ceed
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-14 01:48:36 -07:00
dotnet-maestro[bot]
9ff3ee5fc9 Update dependencies from https://github.com/dotnet/sdk build 20220713.52
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.39 -> To Version 6.0.400-preview.22363.52

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.3.0-rc.123 -> To Version 6.3.0-rc.128 (parent: Microsoft.NET.Sdk
2022-07-14 05:33:51 +00:00
Marc Paine
07fcef1e98
Merge pull request #14137 from dotnet/darc-release/6.0.4xx-8a7de223-1448-43cf-bb69-9dca8e8931ea
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-13 19:30:38 -07:00
dotnet-maestro[bot]
559f1a1e4d Update dependencies from https://github.com/dotnet/sdk build 20220713.39
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.31 -> To Version 6.0.400-preview.22363.39
2022-07-14 01:08:57 +00:00
Marc Paine
da4c6c0b23 Fix logic for putting the manifests in the right location. 2022-07-13 17:15:27 -07:00
Marc Paine
932c17e5f3
Merge pull request #14136 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-07-13 16:59:13 -07:00
Marc Paine
fa0b68898d
Merge pull request #14135 from dotnet/darc-release/6.0.4xx-9559e784-c2cb-4158-98b5-5646b97b00e3
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-13 16:55:51 -07:00