[release/6.4] Update dependencies from dotnet/core-setup #1223
Conversation
This file contains 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}
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
dougbu
approved these changes
Sep 6, 2019
dougbu
added
the
area-infrastructure
…0190904.16 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19454.16 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19454.16 Dependency coherency updates - Microsoft.CSharp - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…0190905.31 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19455.31 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19455.31 Dependency coherency updates - Microsoft.CSharp - 4.6.0-rc1.19455.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.6.0-rc1.19455.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.6.0-rc1.19455.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.6.0-rc1.19455.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.7.0-rc1.19455.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…0190907.3 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19457.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19457.3 Dependency coherency updates - Microsoft.CSharp - 4.7.0-preview1.19456.20 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-preview1.19456.20 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-preview1.19456.20 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-preview1.19456.20 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-preview1.19456.20 (parent: Microsoft.NETCore.App.Runtime.win-x64)
dougbu
force-pushed
the
darc-release/6.4-5b305db7-f7ad-4508-8982-a7a2c890614b
branch
from
555a6f2
to
e1f6e29
Compare
…0190907.10 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19457.10 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19457.10 Dependency coherency updates - Microsoft.CSharp - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
|
Must retarget projects in this branch to 'netcoreapp3.1' to match the Microsoft.NETCore.App.Ref dependency. |
Auto-Merge StatusThis pull request has been merged because the following merge policies have succeeded.
|
- dotnet/aspnetcore#13581 part 1 of 2 for this repo
…erge conflicts - dotnet/aspnetcore#13581 part 2 of 2 for this repo - set property to 'netcoreapp3.1', matching Microsoft.NETCore.App.Ref package layout
dougbu
force-pushed
the
darc-release/6.4-5b305db7-f7ad-4508-8982-a7a2c890614b
branch
from
7e592aa
to
6736dd5
Compare
…0190908.7 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19458.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19458.7 Dependency coherency updates - Microsoft.CSharp - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
This was referenced Sep 8, 2019
…0190909.38 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19459.38 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19459.38 Dependency coherency updates - Microsoft.CSharp - 4.7.0-preview1.19459.13 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-preview1.19459.13 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-preview1.19459.13 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-preview1.19459.13 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-preview1.19459.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
JunTaoLuo
reviewed
Sep 11, 2019
src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
Show resolved
Hide resolved
dotnet-maestro
bot
deleted the
darc-release/6.4-5b305db7-f7ad-4508-8982-a7a2c890614b
branch
|
@dougbu feel free to take a look at all of the changes I made but it looks like the bot merged this since all the checks passed. |
dougbu
reviewed
Sep 13, 2019
| <TargetingPackVersion Condition="'%(TargetFramework)' == 'netcoreapp3.0'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion> | ||
| <!-- Use the latest version instead of the one bundled with the SDK. --> | ||
| <KnownFrameworkReference Update="Microsoft.NETCore.App" | ||
| Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' "> |
There was a problem hiding this comment.
@(KnownFrameworkReference) is a collection that's not specific to whatever inner or outer build is currently running. So, this is incorrect, probably something copied from one of my PRs when it wasn't completely done. The conditions were correct before modulo the $(DefaultNetCoreTargetFramework) substitution e.g. https://github.com/aspnet/EntityFrameworkCore/blob/3a7c46cdf1ffc2181e6590836157fdb5329bb68d/Directory.Build.targets#L6-L10
Please submit a fix ASAP
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/dotnet/core-setup
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