Commit graph

28467 commits

Author SHA1 Message Date
dotnet-maestro[bot]
7b19e53bf2
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17530)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2023-10-16 20:01:22 +00:00
Marc Paine
611d25df33
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17496) 2023-10-12 11:29:13 -07:00
v-wuzhai
242c03a366
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17507) 2023-10-11 19:24:15 -07:00
dotnet-maestro[bot]
8cf3bdf83c Update dependencies from https://github.com/dotnet/arcade build 20231011.9
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9
2023-10-12 00:04:46 +00:00
Jason Zhai
b828069725 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-10-10 23:26:29 -07:00
Marc Paine
8be1e68454
Merging internal commits for release/7.0.3xx (#17491) 2023-10-10 17:01:05 -07:00
Nikola Milosavljevic
010d736fac
.NET Source-Build 7.0.112 October 2023 Updates (#17495) 2023-10-10 15:41:29 -07:00
Sean Reeser
d79042907c Merge commit '552bd6c89b07627bc57be1c07b59e0e2c8934207' into internal-merge-7.0.3xx-2023-10-10-1031 2023-10-10 10:31:45 -07:00
Forgind
f6f1b4c098
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17468) 2023-10-04 14:58:52 -07:00
Forgind
b97ea40f83
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2023-10-04 14:09:18 -07:00
Forgind
0dd530d64d
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17465) 2023-10-04 14:00:27 -07:00
Forgind
58833719fe
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2023-10-04 12:53:49 -07:00
dotnet-maestro[bot]
23c6cc4823
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17446)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2023-10-04 17:13:57 +00:00
Marc Paine
510dea50c0
Update branding to 7.0.310 (#17462) 2023-10-03 17:14:29 -07:00
Marc Paine
3e619d3199
Update branding to 7.0.113 (#17461) 2023-10-03 17:14:26 -07:00
Marc Paine
eee6cb916f
Update branding to 6.0.416 (#17460) 2023-10-03 17:14:23 -07:00
Sean Reeser
07b77653a1 Update branding to 7.0.310 2023-10-03 15:46:52 -07:00
Sean Reeser
e30e5b6c74 Update branding to 7.0.113 2023-10-03 15:46:48 -07:00
Sean Reeser
b29045dcd4 Update branding to 6.0.416 2023-10-03 15:46:44 -07:00
DotNet Bot
552bd6c89b Merged PR 34164: [internal/release/frameshift/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230930.36
- **Date Produced**: October 1, 2023 2:06:09 AM UTC
- **Commit**: f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:d52de2a0-7c5a-452e-752b-08dbbf92e774)
2023-10-01 02:24:36 +00:00
DotNet Bot
bbe858fa8c Merged PR 34114: [internal/release/frameshift/7.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.AspNetCore.App.Ref**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230929.68
- **Date Produced**: September 30, 2023 5:41:36 AM UTC
- **Commit**: 5a48ee082690a5e3b6a0b51632071f89c2f8d725
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.12 to 7.0.12][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.12 to 7.0.12][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **dotnet-dev-certs**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **dotnet-user-jwts**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **dotnet-user-secrets**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2cabc04368&targetVersion=GC...
2023-09-30 06:08:31 +00:00
DotNet-Bot
e610891a41 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.68
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309

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.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-30 06:02:58 +00:00
Sean Reeser
a86bb55379 Merged PR 34044: Deleted 0002-Add-explicit-System.Text.Json-dependency.patch
Deleted 0002-Add-explicit-System.Text.Json-dependency.patch

The patch is unable to be applied.
2023-09-29 17:44:36 +00:00
Sean Reeser
f10d699fa9 Deleted 0002-Add-explicit-System.Text.Json-dependency.patch
The patch is unable to be applied.
2023-09-29 17:27:12 +00:00
DotNet Bot
655027cbb6 Merged PR 34041: [internal/release/frameshift/7.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 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.10-servicing.23367.2 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.10-servicing.23367.2 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.10-servicing.23364.4 to 7.0.12-servicing.23478.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230929.6
- **Date Produced**: September 29, 2023 4:28:01 PM UTC
- **Commit**: 2cabc043689054a1f0ddf5895d32572190515ae8
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23478.17 to 7.0.309-servicing.23479.6][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servic...
2023-09-29 16:49:52 +00:00
DotNet-Bot
8b85dc17dd Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309

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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-29 16:46:28 +00:00
DotNet Bot
46b5572002 Merged PR 34018: [internal/release/frameshift/7.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.NETCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23321.1 to 7.0.100-1.23401.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.10 to 7.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.10 to 7.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230928.17
- **Date Produced**: September 28, 2023 3:39:44 PM UTC
- **Commit**: 804aff807ca42d6f112bf7dd26dfe6161aa1f11b
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx
...
2023-09-28 16:26:56 +00:00
DotNet-Bot
ce6ed2d04a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.17
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.309

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,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.NET.ILLink.Tasks,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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-28 16:10:16 +00:00
DotNet-Bot
2f011300bf Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.8
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.309

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,Microsoft.NET.ILLink.Tasks
 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-28 15:01:07 +00:00
Matt Thalman
71749d3383
Handle variations in branch names for triggering SB tarball build (#17434) 2023-09-27 21:48:21 +00:00
v-wuzhai
2c5539a854
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17364) 2023-09-15 00:20:27 -07:00
Jason Zhai
9b26695694 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-09-14 23:02:32 -07:00
Marc Paine
1de4dda4b8
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17355) 2023-09-14 13:22:24 -07:00
Jason Zhai
40215eb0b8 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-09-13 19:13:49 -07:00
v-wuzhai
b8d6c9df84
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17347) 2023-09-14 01:53:22 +00:00
v-wuzhai
7171c500e4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17350) 2023-09-14 01:52:25 +00:00
Jason Zhai
534924d8ad Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-09-12 23:59:40 -07:00
Jason Zhai
0a49407f60 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-09-12 23:51:43 -07:00
Noah Gilson
18327ecb64
Merging internal commits for release/6.0.1xx (#17338) 2023-09-12 14:31:34 -07:00
NET Source-Build Bot
0c7d38132a
.NET Source-Build 7.0.111 September 2023 Updates (#17341) 2023-09-12 16:06:51 -05:00
Noah Gilson
c013db3ada
Merging internal commits for release/6.0.3xx (#17337) 2023-09-12 13:32:25 -07:00
Noah Gilson
8ae8f086bc
Merging internal commits for release/6.0.4xx (#17336) 2023-09-12 13:32:15 -07:00
Noah Gilson
3f7c8d8f8c
Merging internal commits for release/7.0.1xx (#17335) 2023-09-12 13:32:10 -07:00
Noah Gilson
804f67d6fd
Merging internal commits for release/7.0.3xx (#17334) 2023-09-12 13:32:06 -07:00
Sean Reeser
6935c9da09 Merge commit 'dc5a76ad5c4ed1292be9d96e40d3baa5cdc6b4ef' into internal-merge-6.0.1xx-2023-09-12-1023 2023-09-12 10:23:22 -07:00
Sean Reeser
817f6beb0d Merge commit 'd9644dc1fe191866cfbd303b9d4250e3ac680d80' into internal-merge-6.0.3xx-2023-09-12-1023 2023-09-12 10:23:13 -07:00
Sean Reeser
e51baa7adb Merge commit 'dc3b5c43414b3d69ce876ba4c7230fbfd04a9170' into internal-merge-6.0.4xx-2023-09-12-1023 2023-09-12 10:23:05 -07:00
Sean Reeser
3bf68f064c Merge commit '06c8b346e488025d42d9cb905b47f4b3c3015ae3' into internal-merge-7.0.1xx-2023-09-12-1019 2023-09-12 10:19:00 -07:00
Sean Reeser
cbcca630a5 Merge commit 'f6a2f50f2d67a07264605ee7044c2515ba30f20f' into internal-merge-7.0.3xx-2023-09-12-1018 2023-09-12 10:18:52 -07:00
v-wuzhai
d84e9af96c
Update branding to 7.0.309 (#17287) 2023-09-04 05:40:33 +00:00