Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate conditional compilation #49150

Merged
merged 2 commits into from
Nov 5, 2020
Merged

Conversation

AlekseyTs
Copy link
Contributor

This is a follow up on two previous PRs.
Closes #45758.

This is a follow up on two previous PRs.
Closes dotnet#45758.
@AlekseyTs AlekseyTs requested a review from a team as a code owner November 3, 2020 12:52
@AlekseyTs AlekseyTs requested review from cston and 333fred November 3, 2020 12:52
Copy link
Member

@333fred 333fred left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for consolidating. This LGTM, one minor formatting nit.

@AlekseyTs
Copy link
Contributor Author

@cston, @dotnet/roslyn-compiler Please review, need a second sign-off.

@cston
Copy link
Member

cston commented Nov 5, 2020

Are the deletes and adds of code blocks in the Adapter files just code moves?

@AlekseyTs
Copy link
Contributor Author

Are the deletes and adds of code blocks in the Adapter files just code moves?

Yes. Just moved members around

@AlekseyTs AlekseyTs merged commit af3ddd6 into dotnet:master Nov 5, 2020
@ghost ghost added this to the Next milestone Nov 5, 2020
shyamnamboodiripad pushed a commit that referenced this pull request Nov 6, 2020
This is a follow up on two previous PRs.
Closes #45758.
333fred added a commit to 333fred/roslyn that referenced this pull request Nov 9, 2020
* upstream/master: (519 commits)
  Remove workaround in PEMethodSymbol.ExplicitInterfaceImplementations (dotnet#49246)
  Enable LSP pull model diagnostic for XAML. (dotnet#49145)
  Update dependencies from https://github.com/dotnet/roslyn build 20201109.8 (dotnet#49240)
  Add test for with expression in F1 help service (dotnet#49236)
  Cache RegexPatternDetector per compilation
  Fix RazorRemoteHostClient to maintain binary back-compat
  Further tweak inline hints
  Fix MemberNames API for records (dotnet#49138)
  Minor cleanups (dotnet#49204)
  Report warning for assignment or explicit cast of possibly null value of unconstrained type parameter type (dotnet#48803)
  Clean up of EditorFeatures.Cocoa.Snippets (dotnet#49188)
  Fix OK button state handling. Make relation between viewmodels more tightly coupled
  Extend make type abstract to include records (dotnet#48227)
  Remove duplicated implementations of C# event hookup
  Add select all/deselect all buttons
  Consolidate conditional compilation (dotnet#49150)
  Implement IEquatable on Microsoft.Cci.DefinitionWithLocation structure (dotnet#49162)
  Add new document extensions file
  Unify implementations
  Only disable structure tagger provider in LSP scenario
  ...
@allisonchou allisonchou modified the milestones: Next, 16.9.P2 Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider hiding nullability differences in PEModuleBuilder.Translate()
4 participants