Merge main to 17.13#18204
Merged
Merged
Conversation
* Show default value of compiler options * Locale files * Revert "Show default value of compiler options" This reverts commit 842c2c1. * Revert "Locale files" This reverts commit 47de522. * Draft * Auto-generated default values * Update compiler_help_output.bsl * Format file * Update expected-help-output.bsl * Update help baseline files * Update release notes --------- Co-authored-by: nih0n <feh.omori@gmail.com>
* rebase * orchestrate instead of Async.Sleep * xunit customizations behind conditional compilation * make console capture explicit * diff * try fix test * lazy pattern * reenable extras * test temptath * cleaup test dir * remove unneeded file * fix merge * another shot at fixing gc test * another attempt at improving Async.Parallel test * smaller diff * restore test * restore tests * diff * unblock service tests * rename attributes * fix * revert - should now work without * add comment * diff * diff Co-authored-by: Petr <psfinaki@users.noreply.github.com> * just exclude gc test * diff * exclude test case * try to trigger clr error in ci * try unflake test * unflake asyncmemo * ilverify * fix merge * some cleanup * Update tests/fsharp/Compiler/CodeGen/EmittedIL/DeterministicTests.fs Co-authored-by: Petr <psfinaki@users.noreply.github.com> * remove timeout * Make FsiTests sequential * restore ci throttling * min diff * add comment * bring down the parallelizm a notch on mac and linux --------- Co-authored-by: Petr <psfinaki@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
* exempt FileSystemTests from parallelization * tune down linux test parallelism
* improve concurrent dynamicAssemblyId access in fsi * thread-safe fsi xmlDocCache
…ence-packages build 20241219.1 (#18167) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24604.1 -> To Version 9.0.0-alpha.1.24619.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…223.3 (#18193) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24572.2 -> To Version 9.0.0-beta.24623.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
0101
added
the
NO_RELEASE_NOTES
Contributor
|
T-Gro
approved these changes
Jan 6, 2025
…c/fsi/console.fs (#18201)
This was referenced Jan 8, 2025
Copilot AI
added a commit
that referenced
this pull request
May 13, 2026
LabelOps resolving merge conflicts in .bsl baseline files can produce patches of many megabytes. The default 1024 KB limit is too restrictive. Set to maximum allowed value of 10240 KB (10 MB). Fixes #18204 Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/2ab60227-7344-4950-a54e-ce17e8c45c90 Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
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
11 participants
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.
Description
Last merge to 17.13 before lockdown