Commit graph

27742 commits

Author SHA1 Message Date
dotnet-maestro[bot]
121675dfa1 Update dependencies from https://github.com/dotnet/arcade build 20231114.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23511.9 -> To Version 7.0.0-beta.23564.5
2023-11-15 18:33:22 +00:00
NET Source-Build Bot
c09863189d
.NET Source-Build 7.0.114 November 2023 Updates (#17780) 2023-11-15 16:19:55 +00:00
Marc Paine
2eb4a6adbb
Merging internal commits for release/7.0.1xx (#17783) 2023-11-14 14:06:10 -08:00
Sean Reeser
33c86a3b3d Merge commit 'b2a71039cd0ad21507999d0d722e558e3ea61ca2' into internal-merge-7.0.1xx-2023-11-14-1054 2023-11-14 10:54:37 -08:00
Marc Paine
534861a70a
Update branding to 7.0.115 (#17716) 2023-11-07 14:16:14 -08:00
Sean Reeser
933802c1ef Update branding to 7.0.115 2023-11-07 10:59:20 -08:00
Nikola Milosavljevic
69ac6e37a2
.NET Source-Build 7.0.113 October 2023 Updates (#17619) 2023-10-24 20:50:26 +00:00
DotNet Bot
b2a71039cd Merged PR 34752: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20231023.36
- **Date Produced**: October 24, 2023 1:58:53 AM UTC
- **Commit**: 5a4609a27acc779cb68107922b00418cc6b907a9
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.114 to 7.0.114][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.114-servicing.23520.56 to 7.0.114-servicing.23523.36][1]
  - **Microsoft.NET.Sdk**: [from 7.0.114-servicing.23520.56 to 7.0.114-servicing.23523.36][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.114-servicing.23520.56 to 7.0.114-servicing.23523.36][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **dotnet-dev-certs**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **dotnet-user-jwts**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **dotnet-user-secrets**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0b9e9a9369&targetVersion=GC5a4609a27a...
2023-10-24 04:42:48 +00:00
DotNet-Bot
b37293dece Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.36
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.114 -> To Version 7.0.114

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-24 02:19:30 +00:00
DotNet Bot
bb6f8acc3a Merged PR 34719: [internal/release/7.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 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.14-servicing.23520.4 to 7.0.14-servicing.23520.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.14-servicing.23520.4 to 7.0.14-servicing.23520.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.14-servicing.23519.17 to 7.0.14-servicing.23520.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.14-servicing.23519.17 to 7.0.14-servicing.23520.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20231020.56
- **Date Produced**: October 21, 2023 2:50:24 AM UTC
- **Commit**: 0b9e9a9369deafc905a483db1784a617a10e5235
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.114 to 7.0.114][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.114-servicing.23520.36 to 7.0.114-servicing.23520.56][1]
  - **Microsoft.NET.Sdk**: [from 7.0.114-servicing.23520.36 to 7.0.114-servicing.23520.56][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.114-servicing.23520.36 to 7.0.114-servicing.23520.56][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.14 to 7.0.14][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23520.4 to 7.0.14-servicing.23520.7][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.14-servicing.23520.4 to 7.0.14-servicing.23520.7][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.14-servicing.23519.17 to 7.0.14-servicing.23520.9][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.14-servici...
2023-10-23 17:48:40 +00:00
DotNet-Bot
239eadcbfc Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.56
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.114 -> To Version 7.0.114

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-21 03:10:49 +00:00
dotnet-bot
345ea7e367 Merge in 'release/7.0.1xx' changes 2023-10-20 23:04:01 +00:00
Michael Yanni
aedbc9f85c
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17592) 2023-10-20 15:55:06 -07:00
DotNet Bot
23f2fdcedc Merged PR 34705: [internal/release/7.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 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.14-servicing.23519.5 to 7.0.14-servicing.23519.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.14-servicing.23519.12 to 7.0.14-servicing.23519.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20231020.36
- **Date Produced**: October 20, 2023 9:07:14 PM UTC
- **Commit**: 548bea6370da8299abae2fae2c5189cc856e7e26
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.114 to 7.0.114][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.114-servicing.23520.12 to 7.0.114-servicing.23520.36][1]
  - **Microsoft.NET.Sdk**: [from 7.0.114-servicing.23520.12 to 7.0.114-servicing.23520.36][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.114-servicing.23520.12 to 7.0.114-servicing.23520.36][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.14 to 7.0.14][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.14-servicing.23519.5 to 7.0.14-servicing.23519.17][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.14-se...
2023-10-20 21:51:35 +00:00
Michael Yanni
d2d167377c Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx
# Conflicts:
#	eng/Versions.props
#	src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs
#	src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt
2023-10-20 14:48:38 -07:00
DotNet-Bot
f91d5e9b77 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.36
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.114 -> To Version 7.0.114

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-20 21:26:53 +00:00
Michael Yanni
cc77b00608
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17586) 2023-10-20 12:47:13 -07:00
DotNet Bot
d3532af554 Merged PR 34694: [internal/release/7.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 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.14-servicing.23519.4 to 7.0.14-servicing.23519.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.14-servicing.23519.4 to 7.0.14-servicing.23519.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.14-servicing.23519.6 to 7.0.14-servicing.23519.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23519.6 to 7.0.14-servicing.23519.18 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.14-servicing.23519.6 to 7.0.14-servicing.23519.18 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.14-servicing.23519.6 to 7.0.14-servicing.23519.18 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.14-servicing.23519.6 to 7.0.14-servicing.23519.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.14-servicing.23518.4 to 7.0.14-servicing.23519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.14-servicing.23518.12 to 7.0.14-servicing.23519.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20231020.12
- **Date Produced**: October 20, 2023 5:58:26 PM UTC
- **Commit**: c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.114 to 7.0.114][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.114-servicing.23519.78 to 7.0.114-servicing.23520.12][1]
  - **Microsoft.NET.Sdk**: [from 7.0.114-servicing.235...
2023-10-20 18:21:27 +00:00
DotNet-Bot
08bff87970 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.12
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.114 -> To Version 7.0.114

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-20 18:18:58 +00:00
DotNet Bot
1f3557e648 Merged PR 34672: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NETCore.App.Ref**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.13 to 7.0.14 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.13 to 7.0.14 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20231019.78
- **Date Produced**: October 20, 2023 5:30:08 AM UTC
- **Commit**: 15ca784d62fc19ab969ab9baa2f00863827cfeab
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.114 to 7.0.114][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.114-servicing.23519.57 to 7.0.114-servicing.23519.78][1]
  - **Microsoft.NET.Sdk**: [from 7.0.114-servicing.23519.57 to 7.0.114-servicing.23519.78][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.114-servicing.23519.57 to 7.0.114-servicing.23519.78][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.14 to 7.0.14][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.14 to 7.0.14][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23518.19 to ...
2023-10-20 06:43:16 +00:00
Jason Zhai
36c64d4ab7 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-10-19 23:04:18 -07:00
DotNet-Bot
1963149569 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.78
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.114 -> To Version 7.0.114

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-20 05:46:41 +00:00
DotNet Bot
00f8652a84 Merged PR 34638: [internal/release/7.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 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.14-servicing.23518.5 to 7.0.14-servicing.23519.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.14-servicing.23518.5 to 7.0.14-servicing.23519.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.13 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.13-servicing.23517.18 to 7.0.14-servicing.23518.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.13 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.13 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.13 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.13 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23519.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.13 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23519.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23519.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23519.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23519.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.13-servicing.23513.5 to 7.0.14-servicing.23518.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.13-servicing.23516.16 to 7.0.14-servicing.23518.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.13-servicing.23517.18 to 7.0.14-servicing.23518.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.13-servic...
2023-10-20 04:52:28 +00:00
DotNet-Bot
aa467047dc Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.57
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.114 -> To Version 7.0.114

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-19 23:34:31 +00:00
Michael Yanni
28c024ef44
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17583) 2023-10-19 14:15:28 -07:00
DotNet Bot
dc468999c9 Merged PR 34582: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20231018.44
- **Date Produced**: October 19, 2023 2:59:26 AM UTC
- **Commit**: 318f5222add234db0f23405cef8fdf17e110ed11
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.113 to 7.0.114][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.113-servicing.23517.43 to 7.0.114-servicing.23518.44][2]
  - **Microsoft.NET.Sdk**: [from 7.0.113-servicing.23517.43 to 7.0.114-servicing.23518.44][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.113-servicing.23517.43 to 7.0.114-servicing.23518.44][2]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.13 to 7.0.14][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23518.5][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.13-servicing.23517.4 to 7.0.14-servicing.23518.5][3]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.13 to 7.0.13][4]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.13-servicing.23516.30 to 7.0.13-servicing.23517.18][4]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.13 to 7.0.13][4]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.13 to 7.0.13][4]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.13 to 7.0.13][4]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.13 to 7.0.14][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.13 to 7.0.14][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.13-servicing.23516.30 to 7.0.13-servicing.23517.18][4]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.13-servicing.23516.30 to 7.0.13-servicing.23517.18][4]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC17fdcf30b7&targetVersion=GC318f5222ad&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC5fd6832be7&targetVersion=GCc70d936013&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC282d49406e&targetVersion=GC1fd68c0252&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)

[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...
2023-10-19 18:40:29 +00:00
Matt Thalman
ce6e592f2d
Disable source build xml doc test (#17579) 2023-10-19 17:37:19 +00:00
DotNet-Bot
7a5581ed81 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.44
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.113 -> To Version 7.0.114

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-19 03:36:05 +00:00
DotNet-Bot
5b636ce332 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.31
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.113 -> To Version 7.0.114
2023-10-19 02:01:15 +00:00
DotNet Bot
5980b95096 Merged PR 34519: [internal/release/7.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 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.2 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.12-servicing.23478.2 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.12-servicing.23477.20 to 7.0.13-servicing.23516.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.12-servicing.23478.3 to 7.0.13-servicing.23513.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.12-servicing.23478.2 to 7.0.13-servicing.23516.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23477.20 to 7.0.13-servicing.23516.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7....
2023-10-19 01:59:38 +00:00
dotnet-bot
c7d2aee32f Merge in 'release/7.0.1xx' changes 2023-10-18 23:22:32 +00:00
Marc Paine
faa1fe4b6d
Update branding to 7.0.114 (#17566) 2023-10-18 16:08:53 -07:00
Marc Paine
8de6656c8b
Update branding to 6.0.417 (#17565) 2023-10-18 16:08:50 -07:00
Marc Paine
a9e61e5c24
Update branding to 6.0.320 (#17564) 2023-10-18 16:08:48 -07:00
Sean Reeser
d9ec7ce28a Update branding to 7.0.114 2023-10-18 12:30:18 -07:00
Sean Reeser
40538ec519 Update branding to 6.0.417 2023-10-18 12:30:13 -07:00
Sean Reeser
3b8e5ee013 Update branding to 6.0.320 2023-10-18 12:30:08 -07:00
DotNet-Bot
53809c21ea Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.43
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.112 -> To Version 7.0.113

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk
2023-10-18 00:13:22 +00:00
Marc Paine
3c1a9bd832
[release/6.0.1xx] Update Windows SDK projection (#17540) 2023-10-17 13:23:08 -07:00
dotnet-bot
02412a9dd2 Merge in 'release/7.0.1xx' changes 2023-10-17 20:09:36 +00:00
Marc Paine
2b81cc5a75
[release/7.0.1xx] Update Windows SDK projection (#17543) 2023-10-17 13:00:56 -07:00
Marc Paine
e82a103355
[release/6.0.4xx] Update Windows SDK projection (#17542) 2023-10-17 13:00:54 -07:00
Marc Paine
f94804596c
[release/6.0.3xx] Update Windows SDK projection (#17541) 2023-10-17 13:00:51 -07:00
Manodasan Wignarajah
3f50f78ff7
Update Windows SDK projection 2023-10-17 11:26:23 -07:00
Manodasan Wignarajah
5b5d340010
Update Windows SDK projection 2023-10-17 11:25:03 -07:00
Manodasan Wignarajah
a7e0e0daac
Update Windows SDK projection 2023-10-17 11:24:02 -07:00
Manodasan Wignarajah
000f908958
Update Windows SDK Projection 2023-10-17 11:21:26 -07:00
Marc Paine
f97658a0f2
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17519) 2023-10-13 14:04:48 -07:00
Sean Reeser
32369c007b Merged PR 34376: [internal/release/7.0.1xx] Merge from public
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
2023-10-13 19:14:08 +00:00
v-wuzhai
2254b2bcf7
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17518) 2023-10-13 01:11:54 -07:00