Skip to content

Merge master into features/embeddedJson#26818

Merged
jcouv merged 80 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:features/embeddedJson
May 12, 2018
Merged

Merge master into features/embeddedJson#26818
jcouv merged 80 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:features/embeddedJson

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

No description provided.

zaytsev-victor and others added 30 commits December 10, 2017 16:36
# Conflicts:
#	src/EditorFeatures/CSharpTest/Diagnostics/GenerateMethod/GenerateMethodTests.cs
jasonmalinowski and others added 23 commits May 8, 2018 14:38
Exclude Microsoft.Composition as something we build a dependency map for
…kalloc expressions (dotnet#26248)

* Produce correct diagnostics on implicit operator conversions for stackalloc expressions

* PR Comments
Fix the message for Make Field Readonly
…n-interpolated-string-refactoring

Escape curly braces in string literals when converting concatenation to interpolated string
Use appropriate analyzer category for these analyzers.
)

`IAssemblySymbol.GivesAccessTo` now has a shared core implementation that permits operation across IAssemblySymbol implementations.
Fixes dotnet#26459
Fixes dotnet#26723
One remaining difference is in the treatment of a strong named assembly and a weak named assembly.  C# treats them as being (capable of being) related for error recovery.  VB does not. We would like to strengthen C# but that may be a breaking change, so we're leaving it as is, at least for now. (See also dotnet#26722)
….8-preview1

Merge dev15.7.x to dev15.8-preview1
Exclude System.Net.Http from PortableFacades
…ertionText

Use completion item InsertionText in the debugger, even before any non-debugger completion sessions have run
"Generate method" refactoring enabled if method name is equal to imported type.
The data is pointing towards procdump being the cause of our random AVs
during the Spanish runs. Disabling procdump on the Spanish runs as an
experiment to see if it increases stability here.
Disable procdump on Spanish runs
…o-master

Merge dev15.8-preview1 to master
@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners May 12, 2018 19:27
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jcouv @jmarolf can you merge these feature-branch updates in? Thanks!

@jcouv jcouv merged commit bb7615d into dotnet:features/embeddedJson May 12, 2018
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.