Skip to content

[main] Update dependencies from dotnet/runtime #24861

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
May 14, 2021
Merged

[main] Update dependencies from dotnet/runtime #24861

merged 5 commits into from
May 14, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 8, 2021 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/dotnet/runtime

  • Subscription: daf314a8-d8c8-4b54-8dcc-08d82e674dfc
  • Build: 20210510.6
  • Date Produced: 5/10/2021 8:21 PM
  • Commit: f525dcd5d4abef2925a6004149872e03b1135dfa
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
e8405df 
…0508.8

Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Extensions.Logging , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , System.Diagnostics.DiagnosticSource , System.Collections.Immutable
 From Version 6.0.0-preview.5.21226.1 -> To Version 6.0.0-preview.5.21258.8
@dotnet-maestro dotnet-maestro bot requested a review from dougbu as a code owner May 8, 2021 23:22
ghost
ghost approved these changes May 8, 2021
View reviewed changes
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-approving dependency update.

@dougbu
Copy link
Contributor

dougbu commented May 8, 2021

Hmm, this was probably opened instead of updating #24824 because that one contains an extra commit. Let's use this going forward…

/fyi @lewing @davidfowl

@dougbu dougbu mentioned this pull request May 8, 2021
Closed
@dougbu
Copy link
Contributor

dougbu commented May 8, 2021

@ericstj this and dotnet/aspnetcore#32461 are now broken because Microsoft.Extensions.HostFactoryResolver.Sources lacks the expected build/Microsoft.Extensions.HostFactoryResolver.Sources.targets. Is this a similar problem to previous one seen in dotnet/aspnetcore#32461 (that you fixed)❔

@dougbu dougbu mentioned this pull request May 8, 2021
Merged
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
862e8f2 
…0510.1

Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Extensions.Logging , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , System.Diagnostics.DiagnosticSource , System.Collections.Immutable
 From Version 6.0.0-preview.5.21226.1 -> To Version 6.0.0-preview.5.21260.1
@ViktorHofer
Copy link
Member

@ericstj this and dotnet/aspnetcore#32461 are now broken because Microsoft.Extensions.HostFactoryResolver.Sources lacks the expected build/Microsoft.Extensions.HostFactoryResolver.Sources.targets. Is this a similar problem to previous one seen in dotnet/aspnetcore#32461 (that you fixed)❔

@dougbu The build target isn't auto-generated anymore because the <IsSoucePackage /> declaration was lost during the migration. This will be fixed with dotnet/runtime#52541.

@dougbu
Copy link
Contributor

dougbu commented May 10, 2021

This will be fixed with dotnet/runtime#52541.

This was fixed❕ Many thanks @ViktorHofer❕

@Tratcher the fix hasn't reached the BAR or this PR. The currently-running official build of dotnet/runtime missed @ViktorHofer's change by (just) one commit. Probably need to wait about 3 hours before this PR or dotnet/aspnetcore#32461 see a fixed build.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
d47ef34 
…0510.6

Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Extensions.Logging , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , System.Diagnostics.DiagnosticSource , System.Collections.Immutable
 From Version 6.0.0-preview.5.21226.1 -> To Version 6.0.0-preview.5.21260.6
@Tratcher
Copy link
Member

@davidfowl is this another DI issue?

System.AggregateException : One or more errors occurred. (Value cannot be null. (Parameter 'type')) (The following constructor parameters did not have matching fixture data: ComplexNavigationsODataQueryTestFixture fixture)
---- System.ArgumentNullException : Value cannot be null. (Parameter 'type')
---- The following constructor parameters did not have matching fixture data: ComplexNavigationsODataQueryTestFixture fixture
----- Inner Stack Trace #1 (System.ArgumentNullException) -----
   at System.Reflection.IntrospectionExtensions.GetTypeInfo(Type type)
   at Microsoft.AspNet.OData.DefaultContainerBuilder.BuildContainer()
   at Microsoft.AspNet.OData.PerRouteContainerBase.CreateODataRootContainer(Action`1 configureAction)
   at Microsoft.AspNet.OData.PerRouteContainerBase.CreateODataRootContainer(String routeName, Action`1 configureAction)
   at Microsoft.AspNet.OData.Extensions.ODataEndpointRouteBuilderExtensions.MapODataRoute(IEndpointRouteBuilder builder, String routeName, String routePrefix, Action`1 configureAction)
   at Microsoft.AspNet.OData.Extensions.ODataEndpointRouteBuilderExtensions.MapODataRoute(IEndpointRouteBuilder builder, String routeName, String routePrefix, IEdmModel model, IODataPathHandler pathHandler, IEnumerable`1 routingConventions, ODataBatchHandler batchHandler)
   at Microsoft.EntityFrameworkCore.Query.ODataQueryTestFixtureInitializer.<>c__DisplayClass0_0`1.<Initialize>b__6(IEndpointRouteBuilder endpoints) in D:\workspace\_work\1\s\test\EFCore.OData.FunctionalTests\Query\ODataQueryTestFixtureInitializer.cs:line 62
   at Microsoft.AspNetCore.Builder.EndpointRoutingApplicationBuilderExtensions.UseEndpoints(IApplicationBuilder builder, Action`1 configure)
   at Microsoft.EntityFrameworkCore.Query.ODataQueryTestFixtureInitializer.<>c__DisplayClass0_0`1.<Initialize>b__4(IApplicationBuilder app) in D:\workspace\_work\1\s\test\EFCore.OData.FunctionalTests\Query\ODataQueryTestFixtureInitializer.cs:line 50
   at Microsoft.AspNetCore.Hosting.WebHostBuilderExtensions.<>c__DisplayClass0_0.<Configure>b__0(WebHostBuilderContext _, IApplicationBuilder app)
   at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass17_2.<Configure>b__2(IApplicationBuilder app)
   at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.<Configure>g__MiddlewareFilterBuilder|0(IApplicationBuilder builder)
   at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.<Configure>b__0(IApplicationBuilder app)
   at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken)
   at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken)
   at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Start(IHost host)
   at Microsoft.EntityFrameworkCore.Query.ODataQueryTestFixtureInitializer.Initialize[TContext](String storeName, IEdmModel edmModel, List`1 customRoutingConventions) in D:\workspace\_work\1\s\test\EFCore.OData.FunctionalTests\Query\ODataQueryTestFixtureInitializer.cs:line 76
   at Microsoft.EntityFrameworkCore.Query.ComplexNavigationsODataQueryTestFixture..ctor() in D:\workspace\_work\1\s\test\EFCore.OData.FunctionalTests\Query\ComplexNavigationsODataQueryTestFixture.cs:line 23
----- Inner Stack Trace #2 (Xunit.Sdk.TestClassException) -----

@davidfowl
Copy link
Member

davidfowl commented May 11, 2021 •
edited
Loading

The DI issues are never ending. I'm not sure, I haven't seen this one yet.

@davidfowl
Copy link
Member

OK so it's this https://github.com/OData/WebApi/blob/757631faf10b494e55117904196e8aa45d4c764d/src/Microsoft.AspNet.OData.Shared/DefaultContainerBuilder.cs#L80-L92. It's looking in the wrong assembly... We moved the type (with type forwards recently).

@davidfowl davidfowl mentioned this pull request May 11, 2021
Closed
@ericstj
Copy link
Member

ericstj commented May 12, 2021

Crud, I screwed up the commit history here. Let me see if I can fix it.

@ericstj ericstj force-pushed the darc-main-4e49d5fd-8472-4fff-a677-8f420daab947 branch from 78c707e to fbd1ebc Compare May 12, 2021 20:18
@ericstj
Copy link
Member

ericstj commented May 12, 2021

Fixed 👍

@ericstj
Workaround reflection bug in OData
312a3d5 
OData was locating ServiceCollectionContainerBuilderExtensions in the same assembly as ServiceCollection.

This broke when ServiceCollection was pushed down to another assembly.

This works around it by avoiding reflection and directly calling
ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(this IServiceCollection).

This commit can be reverted when picking up an OData package with
OData/WebApi@1528766
@ericstj ericstj force-pushed the darc-main-4e49d5fd-8472-4fff-a677-8f420daab947 branch from fbd1ebc to 312a3d5 Compare May 12, 2021 20:29
@davidfowl
Copy link
Member

You can update it when the package is available.

@ericstj
Copy link
Member

ericstj commented May 12, 2021 •
edited
Loading

Hey folks, looks like we're past the OData bug, now seeing a bunch of failures in Microsoft.EntityFrameworkCore.InMemory.FunctionalTests. At first I thought it was just a flaky Can_use_sequence_end_to_end_from_multiple_contexts_concurrently_async but on rerun it failed in many more places, across platforms.

@ajcvickers
Copy link
Contributor

@davidfowl More D.I. issues?

@davidfowl
Copy link
Member

😅 longest bug tail ever

@davidfowl
Copy link
Member

I'm looking into it

@davidfowl
Copy link
Member

@ajcvickers it would be good to get someone from the team to help investigate though. Just in case it might be something else.

@davidfowl
Copy link
Member

OK I can reproduce the failure consistently locally.

@davidfowl davidfowl mentioned this pull request May 13, 2021
Merged
@davidfowl
Copy link
Member

OK another fix it up for this.

@jkotalik
Copy link
Contributor

@davidfowl I assume I just need to wait for a dependency update on this PR at this point, correct? Or is there reactionary work needed after your PR to runtime is merged?

@ericstj
Copy link
Member

ericstj commented May 13, 2021

I believe we need to manually trigger it now, since I touched the branch. Helix won't do it automatically. @dougbu is that right?

@ericstj
Copy link
Member

ericstj commented May 13, 2021

This is the build that will have the change: https://dev.azure.com/dnceng/internal/_build/results?buildId=1138049&view=results
Should be version 6.0.0-preview.5.21263.7
It's in the process of publishing.

@davidfowl
Copy link
Member

Let's hope that's the last bug😬

@ericstj
Update dependencies from dotnet/runtime manually
2d4f10f 
'6.0.0-preview.5.21260.6' => '6.0.0-preview.5.21263.7' (from build '20210513.7' of 'https://github.com/dotnet/runtime')
@ericstj
Copy link
Member

ericstj commented May 13, 2021

I did a manual update 🤞

@dougbu
Copy link
Contributor

dougbu commented May 14, 2021

I believe we need to manually trigger it now, since I touched the branch. Helix won't do it automatically. @dougbu is that right?

Yes, that's what I've seen too. darc trigger-subscriptions goes and creates a new branch / PR when it decides it can't update the existing one.

In addition, moving faster than our daily subscription makes a great deal of sense here.

@dotnet-maestro dotnet-maestro bot merged commit d277e0c into main May 14, 2021
@dotnet-maestro dotnet-maestro bot deleted the darc-main-4e49d5fd-8472-4fff-a677-8f420daab947 branch May 14, 2021 00:37
@davidfowl
Copy link
Member

Omg it works. Never changing DI again

@dougbu dougbu removed the blocked label Oct 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougbu dougbu Awaiting requested review from dougbu

1 more reviewer
Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
area-infrastructure type-dependency update 🔼
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dougbu @ViktorHofer @Tratcher @davidfowl @ericstj @ajcvickers @jkotalik