FI into ljw1004/roslyn #2
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
Retargeted - Still bind unbound lamda with errors within BindDelegateCreationExpression.
Sym reader helpers
…-future20160501-150015 Conflicts: src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec src/NuGet/Microsoft.CodeAnalysis.Common.nuspec src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec src/NuGet/Microsoft.Net.Compilers.netcore.nuspec src/Scripting/Core/Scripting.csproj src/Tools/CommonNetCoreReferences/project.json src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs src/VisualStudio/Core/Impl/Options/OptionPreviewControl.xaml
DSR.PortablePdb.Tests: Remove dependency on PdbUtilities
…01-150015 Merge master into future
This code has been moved to http://dotnet/roslyn-project-system
- Substitute underlying type with corresponding tuple type at the point of type reference. - Adjusted implementation of symbol display to account for presence of names in the extension tuples. - Implemented proper retargeting for tuple types (multi-targeting support).
Remove ProjectSystem code
…-future20160504-150015 Conflicts: src/Compilers/Core/Portable/PublicAPI.Unshipped.txt src/Dependencies/VisualStudio/project.json src/Features/CSharp/Portable/CSharpFeatures.csproj src/Features/Core/Portable/Features.csproj src/Workspaces/Core/Portable/PublicAPI.Unshipped.txt
…g a default case.
…1) attribute (#11536) * Bug 217740: Repro and test harness for C# * Testing and fixing loading scenario in C# and VB * Verifying VB case using attribute on field * Adding more tests * Adding VB tests * Adding tests * More tests on fields with double-attributes * New test constraint * Fixing VB side to new test constraints * Fixing C# side to new test constraints * Fixing remaining tests * Adding comments * Fixing VB field scenario too
Make compiler familiar with TH2 format of DeprecatedAttribute.
…27-150023 Merge master into future
it looks like diagnostic telemetry got broken when we introduced a new flag for diagnostic engines in update 1. also recent engine v2 changes didn't report all telemetry data
Replace property with method
…ToIntrinsicValueType
fix issue with telemetry.
- It should no longer block future -> master merges, since we've done that now. - It should block any new pull requests that contain the previous bad merge.
…-from-bad-merge Block any commits that derive from a bad merge we removed via force push
removed culture dependency from ConversionsTests
* Update VirtualTreePoint.cs Correct the braces so that they are escaped. * Update VirtualTreePoint.cs Convert the `String.Format` to an Interpolation String. * Update VirtualTreePoint.cs Correct the variable.
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.
No description provided.