Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

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 upstream merges/master-to-master-vs-deps --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

333fred and others added 30 commits November 18, 2019 18:05
…s will be a semantic error, rather than a syntax error.
Add parsing for function pointer types
…ointers

* dotnet/master: (197 commits)
  Update dependencies from https://github.com/dotnet/arcade build 20191201.1 (#40084)
  Update list of C# Next features and reviewers (#39987)
  Update dependencies from https://github.com/dotnet/arcade build 20191130.1 (#40075)
  [master] Update dependencies from dotnet/arcade (#40065)
  Update dependencies from https://github.com/dotnet/arcade build 20191127.4 (#40057)
  Added more tests & fixed minor bug
  Deterministic ordering + added tests back
  Update dependencies from https://github.com/dotnet/arcade build 20191126.2 (#40036)
  removed a test due to random order generation
  Always restore when running a bootstrap build (#40025)
  fixed integration test capitalization for extract method and extract interface
  Fix tests pt2
  DiagnosticIncrementalAnalyzer refactoring (#39956)
  Persistence is always available in OOP
  Update src/Workspaces/Core/Portable/SolutionSize/SolutionSizeTracker.cs
  Fixed tests
  Move reporting of iterator diagnostics to avoid race condition (#39990)
  Update dependencies from https://github.com/dotnet/arcade build 20191125.7 (#40020)
  Fix NGEN priority of csc.exe, vbc.exe, csi.exe (#40016)
  Accidentally deleted something
  ...
Merge master into features/function-pointers
* dotnet/master: (592 commits)
  Improve nullable analysis of local functions (#40422)
  Fix race condition in CodeFixService
  Annotate CSharpCompilation (#40752)
  Revert "Merge pull request #40765 from dibarbet/revert_use_index"
  More feedback
  address feedback
  More refactoring and hardening of remote calls (#40395)
  Update PublishData.json
  Unskip and fix integration test
  Update configs for preview 2 snap
  Improve error message for CS0191 (#40748)
  Revert "Merge pull request #40410 from sharwell/use-index"
  PR feedback
  Report erroneous implicit conversions in a switch expression (#40678)
  Ignore dynamic vs object, etc in pattern-matching machinery. (#40677)
  Handle dependent slots in pattern-matching null tests. (#39625)
  Pass non-null arguments to avoid nullability warning
  Update dependencies from https://github.com/dotnet/arcade build 20200104.1 (#40749)
  [master] Update dependencies from dotnet/arcade (#40718)
  Expose display option to add ! on non-nullable types (#40519)
  ...
Merge master into features/function-pointers
* PROTOTYPE out a few more unimplemented items
* Implement equality.
* Refactored parameters code.
* Additional tests.
* Adjusted some constants and test all.
* Params creation adjustments.
* Small tidyness cleanups.
Add initial symbol binding for function pointer types
…ointers

* dotnet/master: (161 commits)
  Change the text for the newly added background analysis scope option
  format fix
  Fix assertion for the bootstrap compiler
  Address PR feedback
  Address review feedback
  Add comments
  Add tests
  VB can simplify static member access off of 'me'.
  Refactor some dispose code in SymbolUsageAnalysis
  Extract out simplification changes
  Add comment
  Introduce local and remove unnecessary conditional return
  Tweak code formatting
  Reorder conditions for clarity
  Remove unnecessary null check
  Remove unnecessary conditional return
  Update src/Features/Core/Portable/RemoveUnusedParametersAndValues/AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer.SymbolStartAnalyzer.BlockAnalyzer.cs
  Remove unnecessary code nesting
  Tweak code formatting
  Rewrite IsAliasReplaceableExpression as iterative instead of recursive
  ...
Merge master into features/function-pointers
Support emitting function pointers in signatures
* dotnet/master: (918 commits)
  Pure null test on unconstrained type (#41384)
  Fix file headers, bootsrap build issues.
  Make `elementLocations` accept an array of nullable locations in the public api.
  Learn from non-null tests on as operator (#41419)
  Use Microsoft.NET.Sdk.WindowsDesktop for XAML projects (#40234)
  Address feedback.
  Introduce `GetRequiredBinder`.
  Add missing `NotNullWhen` annotations.
  Annotate more of the binder
  Add version of zlib library to deterministic build inputs (#41385)
  [master] Update dependencies from dotnet/arcade (#41354)
  Simplify
  Simplify
  Do not simplify interpolation expressions on implicit receivers.
  Fix local function crash + add tests
  Substituted symbol equality (#41123)
  Fix test failures
  Rename from IncludeNonNullableReferenceTypeModifier to IncludeNotNullableReferenceTypeModifier (#41332)
  Set TEMP environment variable to $TempDir on CI machines (#41361)
  Document placeholders
  ...
333fred and others added 22 commits May 29, 2020 10:30
* upstream/master: (356 commits)
  Fix ConvertIfToSwitch on top-level statement (#44645)
  Test for not inferring inaccessible locals
  Don't sort fields & properties + comments
  Pass around a Document instead of SemanticModel+Workspace again
  Make GenerateInferredCallsiteExpressionAsync return just an Expression
  Getter control flow around GenerateInferredCallsiteExpressionAsync
  Pass around a Document instead of SemanticModel+Workspace
  Fix titles markdown in MetadataFormat.md
  Update dependencies from https://github.com/dotnet/arcade build 20200528.5 (#44660)
  Fix implementation of ISyntaxFacts.IsStatementContainer for top-level statements
  Follow up on 'Top-level statements' feature merge - pack error codes and feature ids. (#44636)
  Update FormattingEngineTriviaTests for top-level statements
  Add a registry storage location for StorageOptions.SQLiteInMemoryWriteCache
  Apply a hang mitigating timeout to InteractiveWithDisplayFormAndWpfWindow
  Update TotalClassifierTests for top-level statements
  Update SyntacticClassifierTests for top-level statements
  Update AutomaticLiteralCompletionTests for top-level statements
  Update RefKeywordRecommenderTests for top-level statements
  Update ReadOnlyKeywordRecommenderTests for top-level statements
  Adjust Roslyn.VisualStudio.IntegrationTests.CSharp.CSharpIntelliSense.CtrlAltSpaceOption unit-test with Top-level statements in mind.
  ...
Address final prototype comments.
* dotnet/master:
  Update error code in ConvertIfToSwitch test
  Don't specify OpenClose, default value is false
  Wait for callbacks to complete before returning
  Tell lsp client not to send us open/close notifications
Merge master into features/function-pointers
…ion-pointers

Merge master to features/function-pointers
… and described in #44553 (comment)

Verified the test failed without any product change.
…provider to register multiple code actions with same equivalence key for backward compatibility. See #44553 (comment) for details
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

@ghost ghost merged commit 8c7d323 into master-vs-deps Jun 1, 2020
@ghost ghost deleted the merges/master-to-master-vs-deps branch June 1, 2020 19:42
This pull request was closed.
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.

7 participants