mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
34381 commits 41 branches 190 tags 95 MiB
Commit graph

6028 commits

Author SHA1 Message Date
dotnet-maestro[bot]
c2b620f37e
[main] Update dependencies from dotnet/sdk (#17077) 
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rc.1.23374.1 to 8.0.0-rc.1.23376.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rc.1.23374.1 to 8.0.0-rc.1.23376.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rc.1.23374.1 to 8.0.0-rc.1.23376.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-rc.1.23375.2 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rc.1.23374.1 to 8.0.0-rc.1.23376.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rc.1.23373.1 to 8.0.0-rc.1.23375.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rc.1.23374.1 to 8.0.0-rc.1.23376.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rc.1.23373.1 to 8.0.0-rc.1.23375.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.0-beta.23371.8 to 12.8.0-beta.23374.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23371.8 to 8.0.100-beta.23374.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.8.0-1.23374.10 to 4.8.0-1.23376.7 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.8.0-preview.1.42 to 6.8.0-preview.1.44 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rc.1.23375.3 to 8.0.0-rc.1.23376.5 (parent: Microsoft.NET.Sdk)

 - Remove obsolete runtime patch
 2023-07-27 19:52:15 +00:00
Matt Thalman
04244dd8d4
Pin OmniSharp version used for testing (#17074) 2023-07-27 13:51:11 -05:00
Forgind
198f9ca7d6 Use task to create BaselineManifest.json 2023-07-26 15:14:15 -07:00
Forgind
9606060377 Tweak task to make it more general 2023-07-26 15:14:04 -07:00
Forgind
1a59a90685 Add to UsingTask (and sort) 2023-07-25 16:08:53 -07:00
Forgind
406f7ed423 Create task to parse json files 2023-07-25 16:08:41 -07:00
Marc Paine
445175df6d
Add output for product commits as JSON (#17000) 2023-07-25 13:47:25 -07:00
Matt Thalman
5b3022c008
Flow Microsoft.CodeAnalysis version to aspnetcore (#17067) 2023-07-25 13:59:29 -05:00
Michael Simons
839c4734de
Fail source build tests when there is a poison leak (#17045) 2023-07-25 10:02:06 -05:00
Matt Thalman
36929803a1
Runtime patch: Update API compat suppressions (#17056) 2023-07-25 08:14:59 -05:00
Thefrank
bda5a2323d
Allow Installer to bundle AspNetCoreRuntime by default under FreeBSD (#14817) 2023-07-25 05:49:38 +00:00
dotnet-maestro[bot]
5203a93f73
[main] Update dependencies from dotnet/source-build-externals (#17027) 
[main] Update dependencies from dotnet/source-build-externals


 - Merge branch 'main' into darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08

 - Merge branch 'main' into darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08

 - Remove patch to unblock sync

 - Merge branch 'darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08' of https://github.com/dotnet/installer into darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08
 2023-07-24 18:52:28 +00:00
dotnet-maestro[bot]
dbf6be2b10
[main] Update dependencies from dotnet/sdk (#17047) 
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rc.1.23370.1 to 8.0.0-rc.1.23371.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rc.1.23370.1 to 8.0.0-rc.1.23371.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rc.1.23370.1 to 8.0.0-rc.1.23371.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-rc.1.23370.13 to 8.0.0-rc.1.23371.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rc.1.23370.1 to 8.0.0-rc.1.23371.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rc.1.23370.1 to 8.0.0-rc.1.23371.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.FSharp.Compiler: from 12.8.0-beta.23369.5 to 12.8.0-beta.23371.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23369.5 to 8.0.100-beta.23371.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.8.0-1.23370.9 to 4.8.0-1.23371.1 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.8.0-preview.1.37 to 6.8.0-preview.1.39 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.7.23368.2 to 8.0.0-rc.1.23371.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-preview.7.23362.1 to 8.0.0-rc.1.23368.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

 - Delete obsolete nuget patch
 2023-07-21 21:42:11 +00:00
Matt Thalman
f6339d410e
Add runtime patch to remove unnecessary suppressions (#17030) 2023-07-21 13:52:01 +00:00
Matt Thalman
18ea05c055
Suppress NU5129 warning for runtime repo (#17029) 2023-07-21 13:51:40 +00:00
Matt Thalman
39378f8cb9
Fix syntax for allowed lss binaries (#17032) 2023-07-21 13:51:19 +00:00
Michael Simons
68ab8a2a2b
Revert "Exclude vstest licenses directory from VMR (#17023)" (#17033) 2023-07-21 09:08:54 +00:00
dotnet-maestro[bot]
117cc25c04
[main] Update dependencies from dotnet/arcade (#16982) 
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 8.0.0-beta.23360.2 to 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23326.1 to 1.0.0-beta.23368.1 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Update sourcelink patch

 - Update sourcelink patch

 - Remove sourcelink dependencies - deployment-tools
 2023-07-20 22:29:15 +00:00
dotnet-maestro[bot]
b1c1345289
[main] Update dependencies from dotnet/sdk (#17034) 
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.7.0-rc.111 to 6.8.0-preview.1.37 (parent: Microsoft.NET.Sdk)

 - Fix incorrect package version property for System.Security.Cryptography.Pkcs
 2023-07-20 22:18:14 +00:00
Matt Thalman
78cf78ca3a
Allow .lss binaries for all repos (#17028) 2023-07-20 13:52:33 +00:00
Michael Simons
ffb1fa4dde
Exclude vstest licenses directory from VMR (#17023) 2023-07-20 01:26:39 -07:00
Sean Reeser
f28324a7b5 remove patch 2023-07-19 19:28:24 -07:00
dotnet-maestro[bot]
491c0f241b
[main] Update dependencies from dotnet/sdk (#17013) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: wtgodbe <wigodbe@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
 2023-07-20 10:38:19 +10:00
Michael Simons
3df53fc088
Change the PackageVersionPropsFlowType to DependenciesOnly (#17011) 2023-07-19 12:44:58 -05:00
Oleksandr Didyk
e5aa146e96
patch VMR-incompatable license in source-build-externals (#17014) 2023-07-19 09:37:25 -05:00
martincostello
615e241f6b Generate text and JSON 
Restore the previous text format so that JSON is in addition.
 2023-07-19 08:47:10 +01:00
kasperk81
15ed53ac32 convert productCommits.txt to productCommits.json 2023-07-19 08:47:10 +01:00
Michael Simons
40d58d6cc5
Remove patches that flowed in from 7.0 branches (#17010) 2023-07-18 22:11:25 +00:00
Michael Simons
e8de6605fc
Re-enable Mvc WebScenarioTests for FSharp (#17009) 2023-07-18 22:09:20 +00:00
Matt Thalman
b0dda375d1 Merged PR 32726: Update SB test baselines 
This reverts the changes that were made in https://github.com/dotnet/installer/pull/16959 and https://github.com/dotnet/installer/pull/16972. These changes only apply to the internal repo.
 2023-07-18 20:37:24 +00:00
Matt Thalman
62e6796ef1
Add Microsoft.CodeAnalysis.AnalyzerUtilities.dll to poison baseline (#17005) 2023-07-18 13:32:26 -05:00
Oleksandr Didyk
a7815af504
add sb test for runtime packs in self-contained publish (#16783) 2023-07-18 12:30:23 -05:00
dotnet-bot
5b0d71301f Merge in 'release/6.0.1xx' changes 2023-07-18 15:44:04 +00:00
Matt Thalman
63943c0014
Update SB SDK diff baseline (#16972) 2023-07-18 08:35:41 -07:00
Michael Yanni
724642682f Merge branch 'main' into merge/release/7.0.4xx-to-main 
# Conflicts:
#	src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
#	src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
 2023-07-17 16:36:58 -07:00
Matt Mitchell
00e4340849 Merged PR 32708: Remove applied source build patch 
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
 2023-07-17 22:00:26 +00:00
DotNet Bot
10710f7d8e Merged PR 32707: [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.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicing.23363.11 to 6.0.21-servicing.23364.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.21-servicing.23363.8 to 6.0.21-servicing.23364.5 (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/_gi...
 2023-07-17 21:13:18 +00:00
Matt Mitchell
5d26c38ee9 Merged PR 32709: Remove applied source build patch 
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
 2023-07-17 21:09:22 +00:00
Sean Reeser
6c0c0d063d Remove applied source build patch 2023-07-17 14:03:39 -07:00
Nikola Milosavljevic
df4ea7dff9
New command-line APIs in sourcelink (#17002) 2023-07-17 12:47:42 -07:00
Jason Zhai
b85ce887ab Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-16 22:56:32 -07:00
Forgind
9d01f1819a
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16994) 2023-07-14 16:17:57 -07:00
Jason Zhai
7195529e0b Merge branch 'release/7.0.4xx' 2023-07-14 01:25:02 -07:00
Jason Zhai
c4596ee6aa Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-13 19:41:41 -07:00
Jason Zhai
78cdd6d8ba Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-13 19:37:41 -07:00
Jason Zhai
63048382f3 Update format patch 2023-07-13 00:12:24 -07:00
Jason Zhai
4c531d279a Try to resolve source-build patch conflicts 2023-07-12 23:40:52 -07:00
Jason Zhai
10cf86df8b Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-12 20:14:11 -07:00
Jason Zhai
0cc3091826 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-12 20:05:55 -07:00
Jason Zhai
5c7af0f162 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-12 20:01:36 -07:00