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 dev16.0.x to master #30046

Merged
561 commits merged into from
Oct 9, 2018
Merged

Merge dev16.0.x to master #30046

561 commits merged into from
Oct 9, 2018

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from dev16.0.x into master.

git fetch --all
git checkout merges/dev16.0.x-to-master
git reset --hard upstream/master
git merge upstream/dev16.0.x
# Fix merge conflicts
git commit
git push merges/dev16.0.x-to-master --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

jcouv and others added 30 commits July 30, 2018 14:49
dotnet/announcements#77 for the change and
where I am stealing this change from.
…/null-operator-enhancements

* dotnet/features/compiler: (145 commits)
  Don't expose BaseJsonConverter.
  Expose way to add custom JsonConverters to support external Roslyn OOP services.
  Delete Contract.* methods that are equivalent to Debug.Assert
  Update Build.proj
  SignatureHelp for invocation should select proper overload (#25835)
  README update
  Revert.
  Fix build.
  Add tests to exercise codepaths.
  Use set.
  Make PinnedSolutionInfo type sealed
  Code Cleanup AB Test (#28625)
  Fix crash for assignable ref this on RHS of assignment (#28667)
  remove random last token from format engine. (#26708)
  Make sure TLS 1.2 is used to fetch from https://dot.net
  Typos
  Escape / and : in format string to avoid tests breaking in different locales
  Remove PR template
  Disable icacls use on Helix
  Fix Rename when there is non-SupportsCompilation projects
  ...
… into unconstrained-type-parameter-nullability

* dotnet/features/NullableReferenceTypes:
  Include nullability in CheckConstraints (#28959)
  Use struct for TypeSymbolWithAnnotations (#28943)
  Publish Linux Test Results
  Force retest
  Migrate Linux tests to VSTS
  Port determinism fixes
  Make sure TLS 1.2 is used to fetch from https://dot.net
  Move to language version 8
  Make mutex creation more robust
  Disable icacls use on Helix
  Disable leak detection tests on x64
  VSTS YAML file
@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 5, 2018

@sharwell @jasonmalinowski Okay, resolved functional conflict and the test in question passes locally. Server test results soon.

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 6, 2018

@jasonmalinowski Alright. Test from earlier passes, the build break is fixed, the tests surrounding the cause of the build break pass... Surely nothing else will go wrong. 👍

@jasonmalinowski
Copy link
Member

@jaredpar Looks like the failure is:

2018-10-08T05:35:37.3143647Z �[39;49m�[31m    Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen.CodeGenNullCoalescingAssignmentTests.IndexerLvalue [FAIL]
2018-10-08T05:35:37.3156051Z �[39;49m�[37m      Roslyn.Test.Utilities.ExecutionException : 
2018-10-08T05:35:37.3158097Z �[39;49m�[37m      Execution failed for assembly ''.
2018-10-08T05:35:37.3159137Z �[39;49m�[37m      Exception: System.InvalidProgramException: Invalid IL code in C:Main (): IL_0011: stloc.0   

Any idea what's up with this?

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 8, 2018

@333fred - It looks like you added these tests a while back. Can you take a look? https://dnceng.visualstudio.com/public/_build/results?buildId=28178&view=logs

Tracking this failure with #30373

(Restarting the tests to see if flaky.)

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 8, 2018

@333fred
Copy link
Member

333fred commented Oct 8, 2018

@dpoeschl looking.

@jaredpar
Copy link
Member

jaredpar commented Oct 8, 2018

Looks like this is broke on Mono nightly. Let me disable that test.

@jaredpar
Copy link
Member

jaredpar commented Oct 8, 2018

Gonna take me 15 minutes to get the Mono bug filed. If you want just disable it now and I'll follow up with a PR to get the appropriate bug attached it shortly.

@jasonmalinowski
Copy link
Member

@jaredpar We'll just wait. This is an interbranch merge and so honestly it's easier to wait until your skip is in and merge that than run into conflicts.

@jaredpar
Copy link
Member

jaredpar commented Oct 8, 2018

Here is the bug report mono/mono#11036

@jaredpar
Copy link
Member

jaredpar commented Oct 8, 2018

Test is properly skipped now.

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 8, 2018

The roslyn-CI run finished, but it's not reporting as such here in GitHub. @jaredpar ?

Also, a new test is failing in Linux_Test mono (tracking via #30386):

2018-10-08T19:50:54.2576265Z �[39;49m�[31m    Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen.DestructorTests.DestructorOverridesNonDestructor [FAIL]
2018-10-08T19:50:54.2588147Z �[39;49m�[37m      Roslyn.Test.Utilities.ExecutionException : 
2018-10-08T19:50:54.2589581Z �[39;49m�[37m      Execution failed for assembly '/tmp/RoslynTests'.
2018-10-08T19:50:54.2589951Z �[39;49m�[37m      Expected: 
2018-10-08T19:50:54.2590219Z �[39;49m�[37m      ~Derived
2018-10-08T19:50:54.2590479Z �[39;49m�[37m      ~Base
2018-10-08T19:50:54.2590710Z �[39;49m�[37m      
2018-10-08T19:50:54.2590942Z �[39;49m�[37m      Actual:   
2018-10-08T19:50:54.2591150Z �[39;49m�[37m      
2018-10-08T19:50:54.2595994Z �[39;49m�[30m      Stack Trace:
2018-10-08T19:50:54.3672328Z �[39;49m�[37m          at (wrapper managed-to-native) System.Reflection.MonoMethod.InternalInvoke(System.Reflection.MonoMethod,object,object[],System.Exception&)
2018-10-08T19:50:54.3676729Z �[39;49m�[37m          at System.Reflection.MonoMethod.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0003b] in <5a872f306a874e34bfe4796f739b7324>:0 
2018-10-08T19:50:54.3679515Z �[39;49m~Derived
2018-10-08T19:50:54.3681333Z ~Base

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 8, 2018

I restarted roslyn-CI from the web portal, and it started https://dnceng.visualstudio.com/public/_build/results?buildId=28479&view=logs... but the "Details" link for roslyn-CI still points to the previous one.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

@ghost ghost merged commit 14e0068 into master Oct 9, 2018
@ghost ghost deleted the merges/dev16.0.x-to-master branch October 9, 2018 02:00
@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 9, 2018

dotnet-automerge-bot approved these changes 14 hours ago

I guess the correct roslyn-CI got hooked up eventually.

This pull request was closed.
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.