[automated] Merge branch 'main' => 'dev'

[github-actions]

I detected changes in the main branch which have not been merged yet to dev. I'm a robot and am configured to help you automatically keep dev up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

• RussKie
• MackinnonBuck
• evgenyfedorov2
• artl93
• stephentoub
• mgravell
• eiriktsarpalis
• jeffhandley
• jmatthiesen
• halter73
• peterwald
• shyamnamboodiripad
• SteveSandersonMS
• dariusclay
• IbrahimMNada
• dotnet-maestro[bot]
• wtgodbe
• gewarren
• joperezr
• amadeuszl
• Demo30
• rainsxng
• jodydonetti
• tarekgh
• martincostello
• iliar-turdushev
• NatMarchand
• eerhardt
• haipz
• makazeu
• carolineRe13
• kzu

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout dev
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/extensions HEAD:merge/main-to-dev

or if you are using SSH

git push [email protected]:dotnet/extensions HEAD:merge/main-to-dev

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-dev'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-dev origin/dev
git pull https://github.com/dotnet/extensions merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/extensions HEAD:merge/main-to-dev

or if you are using SSH

git fetch
git checkout -b merge/main-to-dev origin/dev
git pull [email protected]:dotnet/extensions merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/extensions HEAD:merge/main-to-dev

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

Microsoft Reviewers: Open in CodeFlow

[RussKie]

@stephentoub could you lend me a hand? I'm struggling to resolve the JSON dependencies

/mnt/vss/_work/1/s/src/Shared/JsonSchemaExporter/JsonSchemaExporter.cs(50,95): warning CS0436: The type 'JsonSchemaExporterOptions' in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs' conflicts with the imported type 'JsonSchemaExporterOptions' in 'System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. Using the type defined in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs'. [/mnt/vss/_work/1/s/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj::TargetFramework=net462]
##[warning]src/Shared/JsonSchemaExporter/JsonSchemaExporter.cs(50,95): warning CS0436: (NETCORE_ENGINEERING_TELEMETRY=Build) The type 'JsonSchemaExporterOptions' in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs' conflicts with the imported type 'JsonSchemaExporterOptions' in 'System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. Using the type defined in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs'.
/mnt/vss/_work/1/s/src/Shared/JsonSchemaExporter/JsonSchemaExporter.cs(70,76): warning CS0436: The type 'JsonSchemaExporterOptions' in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs' conflicts with the imported type 'JsonSchemaExporterOptions' in 'System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. Using the type defined in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs'. [/mnt/vss/_work/1/s/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj::TargetFramework=net462]
##[warning]src/Shared/JsonSchemaExporter/JsonSchemaExporter.cs(70,76): warning CS0436: (NETCORE_ENGINEERING_TELEMETRY=Build) The type 'JsonSchemaExporterOptions' in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs' conflicts with the imported type 'JsonSchemaExporterOptions' in 'System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. Using the type defined in '/mnt/vss/_work/1/s/eng/MSBuild/../../src/Shared/JsonSchemaExporter/JsonSchemaExporterOptions.cs'.

[stephentoub]

What is the dev branch and why are we trying to merge main into it?

[RussKie]

Dev branch targets .NET 10. Gradual forward-merge helps us reducing the future toll of retargeting the codebase to .NET 10.

Additionally, it helps fast-tracking the resolution of errors, as the original authors are likely to have the context fresh in their minds. This expedites the process compared to locating the original authors later and requesting them to address the issue some months later.

[stephentoub]

Dev branch targets .NET 10.

Ok, thanks.

could you lend me a hand? I'm struggling to resolve the JSON dependencies

Microsoft.Extensions.AI.Abstractions needs some functionality that's new to System.Text.Json 9.0, but .Abstractions targets the latest LTS of STJ, which in main is 8.0, which lacks that functionality, and so it gets built in via source copy:

extensions/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj

Line 24 in 6def38f

<InjectJsonSchemaExporterOnLegacy>true</InjectJsonSchemaExporterOnLegacy>

With the dev branch being for .NET 10, presumably it's bumping the STJ from 8.0 to 10.0? In which case that STJ now exposes the relevant types. I expect we can delete the above line and anything in the branch that mentions InjectJsonSchemaExporterOnLegacy, along with the whole source folder it brings in.