Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from recent Future into generators #11178

Merged
merged 154 commits into from
May 9, 2016

Conversation

VSadov
Copy link
Member

@VSadov VSadov commented May 9, 2016

No description provided.

atifaziz and others added 30 commits March 16, 2016 09:48
This simplies some of the lifetime handling inside the type.
This brings along our standard trace listener that converts assert
failures over to exceptions, so we don't need IntegrationTraceListener
anymore.
If the VS STA thread is busy, it can reject any calls we make. This
retries them explicitly. I don't like this change, but I don't have
a better option that I know of.
This just hides bugs. If there's a specific point of cleanup that is
flaky, we should target that specific area.
This moves the cleanup process of a test during that test, so that way
any screwups are blamed on the right test.
Otherwise it reuses the default which can conflict if we start another
instance.
…ents

New Visual Studio integration test framework improvements
tmat and others added 27 commits May 5, 2016 12:25
Use nameof() instead of string literals in ArgumentExceptions
…-future20160505-150019

Conflicts:
	Makefile
	src/VisualStudio/CSharp/Impl/CSharpVSResources.resx
	src/VisualStudio/CSharp/Impl/Options/AutomationObject.cs
	src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj
	src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx
	src/Workspaces/Core/Portable/Workspaces.csproj
- Added support for properties and events in tuple type symbol.
- Made additional adjustments to implementation of tuple symbol display around presence of element names.
…20160505-150019

Merge master into future
…net#11075)

Most of this PR is invisible.

What I did was pull down the current toolset packages from azure and replaced the files in the dotnet-cli folder with new ones downloaded from https://github.com/dotnet/cli
…-future20160506-150017

Conflicts:
	src/Debugging/Roslyn.Reflection.Metadata.Decoding/SignatureDecoder.cs
	src/Features/CSharp/Portable/CSharpFeaturesResources.resx
…20160506-150017

Merge master into future
Update CoreFX dependencies to rc3-24102-00
@VSadov
Copy link
Member Author

VSadov commented May 9, 2016

@dotnet/roslyn-compiler - FYI. uneventful merge from future into generators

@VSadov VSadov merged commit ec81cc6 into dotnet:features/generators May 9, 2016
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.

None yet