Merge master to master-vs-deps #23783
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
…e nested parethesized code.
…bdas * dotnet/master: (172 commits) Code cleanup per code review Enable Microsoft.CodeAnalysis.VisualBasic.UnitTests.GetExtendedSemanticInfoTests.GroupBy_Lookup1 unit-test. (#23600) Move usings out Sort usings Wrap completion providers logic in exception filters Update language feature status (#23596) Disallow use of 'out var' in __arglist. (#23570) Keep compilation alive in GetPartialSemanticModelAsync Don't include satellite assemblies in VSIX Fix typo in ConsoleClassifierCS.csproj Update .xlf files Mark Samples projects as NonShipping Turn off loc for SyntaxVisualizerExtension.csproj Update .xlf files Use wildcards in SignToolData.json Conditionally reference XliffTasks Update list of files to sign Add generated XLF files Fix the XliffTasks version Disable GenerateSatelliteAssemblies target ...
…to have less duplication and handle more cases.
As written our restore is treating every package in the toolset project as something to be included when building the project. This causes NuGet to construct a completely non-sensical project.assets.json. Exclude everything so that the resulting file is valid.
Make it a valid library project. Ensuring this works makes restore a much smoother operation.
The dotnet pack command can't handle nuspec files (or at least I can't find the appropriate documentation for it). As such contining to use it for creating NuGet packages for now.
* made bucketting to be better even in telemetry site. previous way made bucketting to be better in watson site but not telemetry site. this should make it to better on both site. * turns out bucket number is 0 based for API but document is 1 based. * changed to use hashcode rather than full callstack since watson will only use first 255 for bucketing.
One of the VB scripting tests changes the default culture to "de-DE" and later prints out a string subject to localization. Now that we actually have satellite assemblies with real translations where the runtime will find them, we're getting the German version rather than the English version. The fix here is to simply update the baseline.
…awler (error list) (#23765)
Handle parentheses in explicit VB delegate creation scenarios.
…line before constraints (#23686)
LOC CHECKIN | dotnet/roslyn-master | 20171212
Move to dotnet restore
|
@dotnet-bot test windows_debug_vs-integration_prtest |
cston
approved these changes
Dec 14, 2017
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-20171214-080022 git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-master-vs-deps-20171214-080022 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.