Merge main to feature/nullness #16752
Merged
Conversation
This file contains 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
* 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 <dawedawe@posteo.de> --------- Co-authored-by: dawe <dawedawe@posteo.de>
* Merge * Bump version * release notes * Versioning --------- Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com>
* 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 <psfinaki@users.noreply.github.com>
* 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 <5451366+psfinaki@users.noreply.github.com>
---------
Co-authored-by: Adam Boniecki <abonie@users.noreply.github.com>
Co-authored-by: Petr <psfinaki@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Merge release/dev17.9 to main
|
⚠ This PR has merge conflicts. @T-Gro |
KevinRansom
approved these changes
Feb 23, 2024
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
T-Gro
reviewed
Mar 4, 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 feature/nullness.
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-feature/nullness git reset --hard upstream/feature/nullness git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-feature/nullness --force