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 future-stabilization into master #12127

Merged
merged 84 commits into from Jun 23, 2016
Merged

Merge future-stabilization into master #12127

merged 84 commits into from Jun 23, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jun 21, 2016

This is an automatically generated pull request from future-stabilization into master.

@dotnet/roslyn-infrastructure:

git remote add vslsnap-roslyn "https://github.com/vslsnap/roslyn.git"
git fetch vslsnap-roslyn
git fetch upstream
git checkout merge-future-stabilization-into-master20160621-150044
git reset --hard upstream/master
git merge upstream/future-stabilization
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-future-stabilization-into-master20160621-150044 --force

Once the merge can be made and all the tests pass, you are free to merge the pull request.

tmat and others added 30 commits June 10, 2016 17:58
Generalize the version update script, add support for LKG
Update PreReleaseOnlyPackages
Prevent stack overflow when creating symbol ids.
this can happen since we don't filter out ide only analyzer when creating compiler driver
which is okay since it will become noop for compiler driver. filtering is basically more work.
Update prerelease nuget version for Dev15 Preview 3
Revert changes to generate release NuGet packages

The build will generate pre-release packages as before recent changes, with a post-build step used to generate release packages.

Reverts changes from bd23fe4 and 169f8e8.
disable workspace document events on project disconnect
The test fired cancellation then waited 100ms for cancellation to be acknowledged.
There's no guarantee on a heavily loaded machine that cancellation will be
acknowledged in that time frame. This test should be reliable, so this 
removes the time out to prevent flakiness. Fixes #11819
fix crash due to result existing both in compiler and ide side.
Add option to disable converting metadata to project references
Revert changes to PreReleaseOnlyPackages

Re-enable generating release packages Microsoft.CodeAnalysis.EditorFeatures.Text, Microsoft.VisualStudio.LanguageServices, and Microsoft.Net.Compilers for publishing to nuget.org.
It does not change the set of pre-release packages generated.

Reverts change from bd23fe4.
…ilization-into-future-stabilization20160615-150226
…e-stabilization20160615-150226

Merge stabilization into future-stabilization
jasonmalinowski and others added 23 commits June 21, 2016 10:02
Don't invoke SignFiles if there's no files to sign
Only compute entry points when compiling everything.
Properly implement type inference for C# member access expressions.
Tie language features to the langver flag
Our test utilities had a number of files that were duplicated in test utility projects.  Changed them to be linked files so we didn't have duplicate sources.
We attempt to bind lambda args against every applicable delegate
type that could be a matching parameter, and then select the
"best" for error recovery.
This also has the effect of removing unbound lambdas from the
bound trees, replacing them with the "best" binding for error
recovery. This makes the semantic model insensitive to any further
trial bindings (i.e. mutation of the unbound lambda cache).
Fixes #12063, #11979, #11901

Remove vestigal "extensionMethodsOfSameViabilityAreAvailable"
thereby reducing coupling between internal compiler APIs.
See also #7740 #5128, where the vestigal APIs were introduced.
There is a long standing bug in the VS SDK which causes builds to fail on deployment errors.  There are no actual deployment issues, the deployment step itself simply fails.  This hits the perf correctness suite pretty regularly and adds no value.  Disabling.
Update CoreFX to RTM,  CoreCLR to the latest bits, SRM to the latest.
Use linked files for shared sources
Don't deploy VSIX during perf correctness run
Make sure CompletionItems have DisplayTexts of differing lengths befo…
…ge-future-stabilization-into-master20160621-150044
@@ -164,6 +164,30 @@ internal static string RequiredFeature(this MessageID feature)
return null;
}

internal static string RequiredFeatureLegacy(this MessageID feature)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaredpar , can you pls review the changes to this file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should delete this function entirely.

@jinujoseph
Copy link
Contributor

Thanks @agocke for helping with conflict resolution

@jinujoseph
Copy link
Contributor

@dotnet-bot test windows_debug_unit64_prtest please

@jinujoseph
Copy link
Contributor

@dotnet-bot retest windows_debug_unit64_prtest please

@jinujoseph jinujoseph merged commit 0eb87a5 into dotnet:master Jun 23, 2016
@jasonmalinowski jasonmalinowski deleted the merge-future-stabilization-into-master20160621-150044 branch June 28, 2016 21:49
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.