[release/3.0] Update dependencies from aspnet/Extensions #18207
Merged
Conversation
This file contains hidden or 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
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
…0191003.1 - Microsoft.Extensions.DependencyInjection - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Configuration.Json - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Configuration - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Caching.Memory - 3.0.1-servicing.19503.1 - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Logging - 3.0.1-servicing.19503.1 Dependency coherency updates - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.DotNet.PlatformAbstractions - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.1 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging)
Auto-Merge StatusThis pull request will be merged because the following merge policies have succeeded.
|
…0191004.1 - Microsoft.Extensions.DependencyInjection - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Configuration.Json - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Configuration - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Caching.Memory - 3.0.1-servicing.19504.1 - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Logging - 3.0.1-servicing.19504.1 Dependency coherency updates - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging) - Microsoft.DotNet.PlatformAbstractions - 3.0.0 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging) - System.Collections.Immutable - 1.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
dougbu
reviewed
Oct 4, 2019
eng/Version.Details.xml
Outdated
| @@ -5,65 +5,65 @@ | |||
| <Uri>https://github.com/dotnet/corefx</Uri> | |||
| <Sha>bedb348c4d93b6172967df6cdeea0272c81eb752</Sha> | |||
| </Dependency> | |||
| <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.1-servicing-19502-01" CoherentParentDependency="Microsoft.Extensions.Logging"> | |||
| <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0" CoherentParentDependency="Microsoft.Extensions.Logging"> | |||
There was a problem hiding this comment.
@wtgodbe why is the bot going back in time here?
There was a problem hiding this comment.
Great question - @mmitche is this related to dotnet/core-setup#8425 or dotnet/core-setup#8426?
CC @dagood
There was a problem hiding this comment.
I think this is because of the CoherentParentDependency on extensions and dotnet/extensions@40cae90
What this means I think is that when it goes to look up which platform abstractions to update to, there are two. There;s one that is available via the pinned ref assembly, and one available via Microsoft.NETCore.App.Runtime.win-x64.
We really want the second one, not the first.
There was a problem hiding this comment.
Should we redo merge conflict resolution (if any) and prefer 3.0.1-servicing-19502-01 over 3.0.0? Is 3.0.0 correct for Microsoft.NETCore.App.Ref? Is 2.1.0 correct for NETStandard.Library.Ref?
NETStandard.Library.Ref is not pinned in Extensions. Should it be?
At a higher level, can the bot be improved to handle pinned dependencies better? Or, would we avoid these problems in the future if we pinned Microsoft.NETCore.App.Ref here too?
dougbu
changed the title
|
Wait for resolution of conversation here and any necessary changes before merging. |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
wtgodbe
added a commit
to dotnet/extensions
that referenced
this pull request
Oct 4, 2019
Move the pinned dependency on `Microsoft.Netcore.App` to the bottom of versions.details.xml to prevent it being picked for CoherentParentDependencies CC @mmitche @dougbu - we think this will fix dotnet/efcore#18207
dougbu
suggested changes
Oct 4, 2019
…0191004.7 - Microsoft.Extensions.DependencyInjection - 3.0.1 - Microsoft.Extensions.Configuration.Json - 3.0.1 - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1 - Microsoft.Extensions.Configuration - 3.0.1 - Microsoft.Extensions.Caching.Memory - 3.0.1 - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19504.7 - Microsoft.Extensions.Logging - 3.0.1 Dependency coherency updates - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.DotNet.PlatformAbstractions - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.1 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging)
dotnet-maestro
bot
changed the title
wtgodbe
approved these changes
Oct 4, 2019
dougbu
approved these changes
Oct 4, 2019
wtgodbe
deleted the
darc-release/3.0-29824be8-f085-4c1f-be6b-471e4b9051a3
branch
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.
This pull request updates the following dependencies
From https://github.com/aspnet/Extensions
Coherency Updates
The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format