Skip to content

Merge Master into Dev16.0.x#4425

Merged
jmarolf merged 939 commits into
dotnet:dev16.0.xfrom
jmarolf:dev16.0.x
Jan 5, 2019
Merged

Merge Master into Dev16.0.x#4425
jmarolf merged 939 commits into
dotnet:dev16.0.xfrom
jmarolf:dev16.0.x

Conversation

@jmarolf
Copy link
Copy Markdown
Contributor

@jmarolf jmarolf commented Jan 4, 2019

Dev16.0.x goes into QB approval mode Today at 6pm (2am Sat UTC)

With this merged that means
dev16.0.x -> Dev16 Preview 2
master -> Dev16 Preview 3

drewnoakes and others added 30 commits November 22, 2018 20:09
All usages were protected by a lock.

Use the collection itself as a lock object, removing a field.

Convert private property to field.
There's no longer any dispose logic for AggregateCrossTargetProjectContext.
Make non-generic, inlining sole type parameter of DependenciesRuleChangeContext.

Also removes IRuleChangeContext.
Add test to cover this scenario.
…romFind

Don't handle TextView so opening results from find works
…ssage

Do not warn about using a pre-release sdk to build
…t-pack

Do not warn about licensing url being deprecated in future versions
This error was introduced in 3744d8f

Fixes dotnet#4313
Ternary with `default` was returning the non-nullable default
(such as `false` or the enum zero value).

Empty strings were not being converted to `null` in one of the string
helpers, contradicting the other string forms and the documentation.
For ImmutableDictionary, this extension method will be chosen over
Enumerable.Count. This version uses the non-allocated enumerator
provided by ImmutableDictionary.

Currently used in GroupedByTargetTreeViewProvider.BuildTreeAsync.
jmarolf and others added 22 commits December 17, 2018 11:40
Thanks for the suggestions Drew

Co-Authored-By: davidwengier <david.wengier@microsoft.com>
This brings the documentation files into the solution so that they
are easier to edit and appear in search results.
…ned-api

remove use of IProjectLockService
We weren't waiting for changes to be applied before we closed the batch. This path is currently synchronous so it's just by change that this currently works.
* Fix violations of IDE0059
…Dev16

Allow design-time build logging to be turned on Dev16/suffixes
 Make sure to apply changes under batch
* Remove commented out logging for launch settings to resolve IDE0060 compiler warnings

* Fix IDE0060 violations
ClearAllErrors was the only method calling this method and would never break out.
Add minimal project for documentation
…xe (dotnet#4400)

* Add AppServicePublish capability to all SDK projects that output to exes (excluding winexe)

* Add FolderPublish capability to all .NET SDK projects
@jmarolf jmarolf requested a review from a team as a code owner January 4, 2019 09:55
@davkean
Copy link
Copy Markdown
Member

davkean commented Jan 4, 2019

@jmarolf What's the walkback for the cutoff, I need #4419 to make it.

@jmarolf
Copy link
Copy Markdown
Contributor Author

jmarolf commented Jan 4, 2019

@davkean It needs to be in the next 6 hours to ensure it makes it before the snap

davkean and others added 2 commits January 5, 2019 00:41
When we've never been set an active editor context, just return the one based on the active configuration.

This combined with dotnet/roslyn#32153, unblocks Razor.
Turn on language-service integration rewrite
@jmarolf
Copy link
Copy Markdown
Contributor Author

jmarolf commented Jan 4, 2019

Including #4419 in this merge. This is the last payload making it from master

@jmarolf jmarolf merged commit 9de64d6 into dotnet:dev16.0.x Jan 5, 2019
@jmarolf jmarolf deleted the dev16.0.x branch March 11, 2019 21:47
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.

9 participants