Merge main to lsp #16990
Merged
Merge main to lsp #16990
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
#16906) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24154.2 -> To Version 9.0.0-alpha.1.24162.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24154.2 -> To Version 9.0.0-alpha.1.24162.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
…ntain errors (#16719) * test * See what happens... * potential fix * revert * what about this * f * Release note * revert --------- Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24170.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Checker/patterns: recover on unresolved long identifiers * Update test baselines * Release notes * try unskip the test --------- Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Petr <psfinaki@users.noreply.github.com>
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24172.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Unskip a few tests * another one
* add test case showing a false positive with yield! * add missing case in IsAppInLambdaBody that can happen with yield! * add release notes entry * update PR number * only bind to what we are interested in * add test expecting a warning for yield! in a list comprehension * add test case using yield! in a custom CE that overflows the stack
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
* Minor README update about proto It's Bootstrap actually. * Update DEVGUIDE.md Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> * Update DEVGUIDE.md --------- Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
…ent (#16942) * Make it easy to bench preview against current
…ests (#16955) * Exclude compiler service benchmark from VMR build when not building tests * remove Z --------- Co-authored-by: Petr <psfinaki@users.noreply.github.com>
…326.8 (#16957) Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24172.5 -> To Version 8.0.0-beta.24176.8 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…327.1 (#16964) Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24176.8 -> To Version 8.0.0-beta.24177.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
When building in the VMR, the per-repo package cache is placed under the repo's artifacts directory. Exclude this when doing the assembly scan. In addition, fix up the file to be compatible with non-windows systems. Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
- OverridePackageSource has no use (and that feed is ancient) - Artifacts categories are long gone - Symbol server publishing and PATs are not required with PublishUsingPipelines Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
…16900) * Raise an warning when Obsolete attribute is used in constructor property assignment.
* Use count = 0 instead of count < 1 * The count < 1 check was a vestige of an older approach for computing the count that could result in a negative count. * Update baselines * Update release notes
Contributor
Author
|
⚠ This PR has merge conflicts. @0101 |
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