Merge main to lsp #16772
Merged
Merge main to lsp #16772
Conversation
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
…209.2 (#16709) Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24081.5 -> To Version 8.0.0-beta.24109.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Expose FSharpProjectSnapshot data. * Trigger CI
) * Add InvalidateConfiguration endpoint with FSharpProjectSnapshot. * Update src/Compiler/Service/service.fsi Co-authored-by: Petr Pokorny <[email protected]> --------- Co-authored-by: Petr Pokorny <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20240213.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24109.2 -> To Version 8.0.0-beta.24113.2 * Update dependencies from https://github.com/dotnet/arcade build 20240213.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24109.2 -> To Version 8.0.0-beta.24113.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <[email protected]>
…de.Parallel (#16717) * don't pass non-threadsafe logger to parallel computations * no need to restore in forks --------- Co-authored-by: Petr <[email protected]>
* fix configuration case * make path construction x-platform * to be consistent * improve path construction
…ence-packages build 20240219.1 (#16738) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24113.1 -> To Version 9.0.0-alpha.1.24119.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Consider prefixed module name in nameof expression. * Consider prefixed module name in nameof pattern. * Remove foo * Update release notes * Update src/Compiler/Driver/GraphChecking/FileContentMapping.fs Co-authored-by: dawe <[email protected]> --------- Co-authored-by: dawe <[email protected]>
* Merge * Bump version * release notes * Versioning --------- Co-authored-by: Florian Verdonck <[email protected]>
* Add unit tests for interp strings with string expr
Sanity check that lowering to concat does not break these simple cases
* Add IL test for lowering to concat
* Add optimization in CheckExpressions
Initial attempt with many TODOs, also not sure whether it should be done
in checking, but it seems that later we would have to again parse the
string (since CheckExpressions is going from AST version of an
interpolated string to a sprintf call basically)
* Do not optimize when format specifiers are there
Cannot really optimize this way if width and other flags are specified.
Typed interpolated expressions should be possible to support, but
skipping them for now (TODO).
* Adjust expected length of codegen
* Filter out empty string parts
E.g. $"{x}{y}" has 5 string parts, including 3 empty strings
* Detect format specifiers better
There were false positives before
* Refactor, improve regex
* Unrelated indentation fix in parser
* Use language feature flag
* FSComp.txt auto-update
* Add release notes
* Add langversion flag to some unit tests
* Fix typo in src/Compiler/FSComp.txt
Co-authored-by: Petr <[email protected]>
* Update .xlf and undo change to CheckFormatStrings
* Add a test, undo change in CheckFormatString
* Refactor based on review suggestions
* Add more IL tests
* Add comments lost in refactoring
* Automated command ran: fantomas
Co-authored-by: psfinaki <[email protected]>
---------
Co-authored-by: Adam Boniecki <[email protected]>
Co-authored-by: Petr <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Merge release/dev17.9 to main
* Initial attempt for GetProjectSnapshotFromScript * Add GetProjectSnapshotFromScript to service. * Address feedback from code review. * Assert both return the same results. * Remove old comment * Construct cache key in ComputeScriptClosure * Include stamp * Don't take projectSnapshot as input for ComputeScriptClosure * Add other flags * Add checksum directly. * Remove duplicate checksum * Use ISourceTextNew for Source * Mark API as experimental
* WIP: Use Arcade's NetCurrent * WIP: Use Arcade's NetCurrent * Ordering of property groups * Build scripts? * Typo * Typo2 * Fix nuspec, please * Updates to support VMR build * Only set tfm option if SourceBuildBootstrapTfm is set * Fix ordering, set tfm before we account for building without arcade * Add rest of test projects * typos * Trimming is isolated and can't use global TFM value * Fix arcade interaction with our build props --------- Co-authored-by: Matt Thalman <[email protected]> Co-authored-by: Petr <[email protected]>
#16720) * First stab at adding a version of TryGetRecentCheckResultsForFile that takes a snapshot instead of project options * use version type without defaultof<_> = null * take sourcetext out of project snapshot, kind of forces us to an async return but let's see if this is acceptable * format * - reuse ParseAndCheckFileInProject cache for TryGetRecentCheckResultsForFile - extend version of ParseAndCheckFileInProject cache with the check sum of the source code - add test * format * cleanup * use a new LruCache member GetAll to get rid of the dummy version * cleanup * Update src/Compiler/Service/TransparentCompiler.fs Co-authored-by: Petr Pokorny <[email protected]> * unify key creation * just use ProjectSnapShot.FileKey * to have it on record, push a version with "f.Version |> Md5Hasher.toString" as the second part of lastFileKey.Version * use FileKeyWithExtraFileSnapshotVersion for the ParseAndCheckFileInProject cache * replace FileSnapShot after edit in Test * add CustomOperation tryGetRecentCheckResults for tests * - Make API non-async and don't return hash - let tests run for background compiler, too * better fix for commandLineOptions order * Update src/Compiler/Service/FSharpProjectSnapshot.fs Co-authored-by: Petr Pokorny <[email protected]> * Update tests/FSharp.Compiler.ComponentTests/FSharpChecker/TransparentCompiler.fs Co-authored-by: Petr Pokorny <[email protected]> * Update tests/FSharp.Compiler.ComponentTests/FSharpChecker/TransparentCompiler.fs Co-authored-by: Petr Pokorny <[email protected]> * fix version predicate * let LruCache.GetAll(key: 'TKey) return a seq instead of a list * compare signatures in CustomOperation tryGetRecentCheckResults to tighten the tests --------- Co-authored-by: Petr Pokorny <[email protected]>
They get in the way of insertions too often
#16757) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240223.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24119.1 -> To Version 9.0.0-alpha.1.24123.3 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240223.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24119.1 -> To Version 9.0.0-alpha.1.24123.3 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240223.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24119.1 -> To Version 9.0.0-alpha.1.24123.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <[email protected]>
Merge release/dev17.9 to main
dotnet-bot
force-pushed
the
merges/main-to-lsp
branch
from
5177b4f to
bc3dd9f
Compare
oleksandr-didyk
approved these changes
Feb 27, 2024
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.
This is an automatically generated pull request from main into lsp.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/main-to-lsp git reset --hard upstream/lsp git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-lsp --force