Merge main to release/dev17.3 #13121
Merged
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
* add fantomasignore * add fantomasignore * fix ignores * fix ignores * update fantomasignore * prefix before formatting * prefix before formatting * bump fantomas version * update tool * update tool * update tool * update tool * add job * add job * apply formatting
* reduce duplicate packagereferences per #13047 (comment) * remove nu1504 nowarns now that we are hopefully compliant.
* Update dependencies from https://github.com/dotnet/arcade build 20220504.2 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22225.6 -> To Version 7.0.0-beta.22254.2 * Update global.json Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
* cleanup * cleanup * cleanup * cleanup * cleanup * cleanup
* cleanup * cleanup * cleanup * cleanup * cleanup * cleanup * cleanup * cleanup * cleanup * cleanup * cleanup * cleanup
* adjust settings * adjust settings * adjust settings * adjust settings * adjust settings * adjust settings * apply formatting
* Upgraded Roslyn and VS packages + added tests for consuming statics in interfaces * Skip abstract statics test on non-netcore * Fix path to csc * Reverted roslyn version to 4.2.*
[main] Update dependencies from dotnet/arcade - Update global.json
* cleanup * split files * rename * split infos.fs and SymbolHelpres.fs * split infos.fs and SymbolHelpres.fs * fix code formating * rename autobox --> LowerLocalMutables * adjust names * block --> ImmutableArray * format * Error --> SRDiagnostic * Error --> SRDiagnostic * this -> _ * rename and cleanup * rename Diagnostic --> FormattedDiagnostic * format sigs * format sigs * fix build * fix build
vzarytovskii
approved these changes
May 9, 2022
* cleanup * split files * rename * split infos.fs and SymbolHelpres.fs * split infos.fs and SymbolHelpres.fs * fix code formating * rename autobox --> LowerLocalMutables * adjust names * block --> ImmutableArray * format * Error --> SRDiagnostic * Error --> SRDiagnostic * this -> _ * rename and cleanup * rename Diagnostic --> FormattedDiagnostic * format sigs * format sigs * organise files in src/fsharp * organise files in src/fsharp * fix build * fix build * fix build * merge * move more files * move more files * move more files * move more files * fix build * file reorg * finish moves * fix links in docs * code format * fix build * save xlf, InteractiveSession/ --> Interactive/ * moved xlf * cleanup .gitignore * fixed Linux build * cleanup docs * cleanup docs
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 release/dev17.3.
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-release/dev17.3 git reset --hard upstream/release/dev17.3 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-release/dev17.3 --force