Repository navigation
[automated] Merge branch 'main' => 'feature/net12-scouting' - #20835
Open
github-actions[bot] wants to merge 8 commits into
Open
github-actions[bot] wants to merge 8 commits into
github-actions[bot] wants to merge 8 commits into
Conversation
* Add narrated slides release agent Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 6cc6e5b6-78b0-43d8-9b4b-d705cb3ec54e * Pin narrated slides wrapper source Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 6cc6e5b6-78b0-43d8-9b4b-d705cb3ec54e --------- Copilot-Session: 6cc6e5b6-78b0-43d8-9b4b-d705cb3ec54e
* Fix struct tuple quotation printer (#20800) Use the stored tuple type only to select the debug-layout node name. Preserve tuple construction, patterns, types and shape reconstruction. Cover all four renderers with typed/untyped literals, both constructors, mixed nesting, generic lambdas, and literal/constructed arities 7/8/9. Add the VNEXT 11.0.200 FSharp.Core printer-only release note. All commands below used BUILDING_USING_DOTNET=true and FSHARPCORE_USE_PACKAGE=false. MTP options are passed directly: the selected SDK rejects the handoff's extra "--" separator. RED/GREEN command (plus Detailed output and xUnit XML diagnostics): dotnet test --project tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj -c Debug -f net11.0 --filter-method "*Issue 20800*" Before product edits: 2 executed, reference passed, struct failed, exit 2. Expected: NewStructTuple (Value (1), Value ("a")) Actual: NewTuple (Value (1), Value ("a")) After the printer-only change: unchanged pair 2/2 passed, exit 0. Expanded matrix: 3/3 passed, exit 0. Both RED and GREEN loaded version 11.0.0.0 from: C:\agents\fsharp-worktrees\issue-2112\artifacts\bin\FSharp.Core.UnitTests\Debug\net11.0\FSharp.Core.dll Each matched the corresponding just-built repository core output: C:\agents\fsharp-worktrees\issue-2112\artifacts\bin\FSharp.Core\Debug\net10.0\FSharp.Core.dll RED SHA256: C1CDC73CE62BAB4DF4478F94CBA53488D69758C896734C4B15D61998DCB28AEF GREEN SHA256: 05129632B3E6821E6E857FDF2EA68A0AEDC3FD4B67EC783707EC7203DFEE3E5D Temporary runtime provenance diagnostics were removed. Validation (all exit 0): .\build.cmd -c Release Initial and final composite builds: 0 errors. dotnet test --project tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj -c Debug -f net11.0 --filter-class "FSharp.Core.UnitTests.Quotations.*" --minimum-expected-tests 1 29/29 passed, including unchanged tuple active-pattern facts. dotnet test --project tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj -c Debug -f net11.0 Total 6358: 6353 passed, 5 skipped, 0 failed. dotnet test --project tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj -c Release -f net11.0 --filter-class "Conformance.Expressions.ExpressionQuotations.*" --minimum-expected-tests 1 123/123 passed, including rendering snapshots. dotnet test --project tests\fsharp\FSharpSuite.Tests.fsproj -c Debug -f net472 -p:BUILDING_USING_DOTNET=false --filter-method "*quotes-*" --output Detailed --minimum-expected-tests 3 3/3 passed: quotes-FSC-FSC_DEBUG, quotes-FSC-BASIC, quotes-FSI-BASIC. These cases are #if !NETCOREAPP; net11.0 cannot discover them. MTP method filtering needs the leading wildcard for qualified names. MSBuild property enables desktop targeting; environment retains the values above and repository core project references remain in use. Both requested file-scoped Fantomas commands ran. The product branch is formatted; tests/ is intentionally excluded by .fantomasignore. No unrelated formatting. git diff --check passed. Bounded read-only expert-reviewer review using GPT-5.4: no findings. Copilot Coding Agent-only final CoreCLR sweep is not applicable to this Copilot CLI execution. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add release notes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Update service-branch-merge.json with new merge config Removed old branch flow configurations and added a new merge configuration for release/10.0.4xx. * Add automatic merge flow from main to feature/net12-scouting Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8dc30c74-e8bc-4ab4-b25f-2ebb9ae42ad7 --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8dc30c74-e8bc-4ab4-b25f-2ebb9ae42ad7
Reset patterns: - global.json - eng/Version.Details.xml - eng/Version.Details.props - eng/Versions.props - eng/common/** - eng/TargetFrameworks.props
…009.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 12.0.0-beta.26505.2 -> To Version 12.0.0-beta.26509.4
…ting' into T-Gro-patch-1
Early .NET 12 alpha SDKs ship with NETCoreAppMaximumVersion=11.0 in Microsoft.NETCoreSdk.BundledVersions.props before the SDK's own TFM bump lands, causing _CheckForUnsupportedNETCoreVersion to fail with NETSDK1045 when targeting net12.0 or running #r "nuget:" on .NET 12. Set NETCoreAppMaximumVersion=12.0 when targeting net12.0. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8dc30c74-e8bc-4ab4-b25f-2ebb9ae42ad7
Read FSharpNetCoreProductTargetFramework from eng/TargetFrameworks.props instead of hardcoding net11.0 in MultithreadedTasks/run.fsx and Fixture.fsproj. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8dc30c74-e8bc-4ab4-b25f-2ebb9ae42ad7
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I detected changes in the main branch which have not been merged yet to feature/net12-scouting. I'm a robot and am configured to help you automatically keep feature/net12-scouting up to date, so I've opened this PR.
This PR merges commits made on main by the following committers:
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-feature/net12-scouting'. 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.
or if you are using SSH
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.