Merge master to master-vs-deps #30037
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
# Conflicts: # src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ObjectInitializerCompletionProviderTests.cs
Add Rename Attribute Test for VB
Change SymbolInlineRenameInfo
|
Resolved .xlf merge conflicts and rerunning tests. |
Add VerifyAttributeRenameWhileRenameAttributeClass
This removes all of the Jenkins jobs that are redundant with our Azure DevOps jobs.
Fix problem to rename Attribute
Add feature to suggest converting code to use compound assignment.
Remove redundant Jenkins jobs
Fix spanish job
This makes the necessary changes to the C# semantic tests so that they can be executed under Mono. This does **not** enable C# semantic in our Mono CI. I will be doing that as a separate PR after some extended validation completes. The reason for committing this now is having our repository in a state where the tests just works make it easier for Mono to validate fixes.
Fix C# semantic tests for Mono execution
I spent a full day trying to track down why the wrong code was being generated for this file and why the generator wasn't running. Fixes #29368
agocke
force-pushed
the
merges/master-to-master-vs-deps
branch
from
e10b0f6
to
8fd0780
Compare
ghost
merged commit
This pull request was closed.
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 master into master-vs-deps.
git fetch --all git checkout merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-master-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.