Skip to content

[master] Update dependencies from dotnet/efcore dotnet/runtime #27845

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
dotnet-maestro merged 79 commits into from
Dec 10, 2020
Merged

[master] Update dependencies from dotnet/efcore dotnet/runtime #27845

dotnet-maestro merged 79 commits into from
Dec 10, 2020

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 14, 2020 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: 68568747-40a2-4823-fae6-08d7f76e4602
  • Build: 20201209.11
  • Date Produced: 12/9/2020 10:34 PM
  • Commit: 8e29c00ac515e6ada57722dc2cb981c2fa977266
  • Branch: refs/heads/master

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

  • Subscription: ccafa991-4408-48df-d45d-08d76e1d3434
  • Build: 20201207.5
  • Date Produced: 12/7/2020 11:16 PM
  • Commit: ae4728aea34871b49dee77ac68b1f578105648dd
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
9e073ca 
…1113.21

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , System.ComponentModel.Annotations , Microsoft.Extensions.Http , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.Net.Http.WinHttpHandler , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.IO.Pipelines , System.Net.Http.Json , System.Net.WebSockets.WebSocketProtocol
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20563.21
@dotnet-maestro dotnet-maestro bot requested a review from dougbu as a code owner November 14, 2020 13:11
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels Nov 14, 2020
ghost
ghost approved these changes Nov 14, 2020
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.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
f56c5cf 
…1114.2

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , System.ComponentModel.Annotations , Microsoft.Extensions.Http , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.Net.Http.WinHttpHandler , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.IO.Pipelines , System.Net.Http.Json , System.Net.WebSockets.WebSocketProtocol
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20564.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
b2ff538 
…115.1

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20565.1
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime [master] Update dependencies from dotnet/runtime dotnet/efcore Nov 16, 2020
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
608c406 
…116.1

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20566.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
f74c080 
…1115.4

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , System.ComponentModel.Annotations , Microsoft.Extensions.Http , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.Net.Http.WinHttpHandler , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.IO.Pipelines , System.Net.Http.Json , System.Net.WebSockets.WebSocketProtocol
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20565.4
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime dotnet/efcore [master] Update dependencies from dotnet/efcore dotnet/runtime Nov 16, 2020
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
3f238e8 
…116.2

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20566.2
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/efcore dotnet/runtime [master] Update dependencies from dotnet/runtime dotnet/efcore Nov 16, 2020
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
d6d5bcf 
…116.3

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20566.3
@dougbu dougbu mentioned this pull request Nov 16, 2020
Closed
@dougbu
Copy link
Contributor

dougbu commented Nov 16, 2020

Blocked by #27687 not providing a replacement for $(MicrosoftNETCoreAppInternalVersion) in global.json. We used Microsoft.NETCore.App.Internal instead of Microsoft.NETCore.App.Runtime.win-x64 because the second didn't update consistently.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
00a4aae 
…116.5

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20566.5
@dougbu
Copy link
Contributor

dougbu commented Nov 17, 2020

#27737 is now in❕😺

dougbu
dougbu reviewed Nov 17, 2020
View reviewed changes
Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

I removed the wrong ...Version property 🤦

dougbu and others added 2 commits November 16, 2020 21:40
@dougbu
Remove correct ...Version property
eba4f80
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
a40b624 
…1117.3

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , System.ComponentModel.Annotations , Microsoft.Extensions.Http , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Net.WebSockets.WebSocketProtocol , System.Net.Http.Json , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.IO.Pipelines , System.Net.Http.WinHttpHandler , System.Windows.Extensions , System.Threading.Channels
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20567.3
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime dotnet/efcore [master] Update dependencies from dotnet/efcore dotnet/runtime Nov 17, 2020
dougbu
dougbu reviewed Nov 17, 2020
View reviewed changes
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
ca9b258 
…117.12

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20567.12
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/efcore dotnet/runtime [master] Update dependencies from dotnet/runtime dotnet/efcore Nov 18, 2020
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
c2dac32 
…118.1

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20568.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
c1556cd 
…1118.2

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , System.ComponentModel.Annotations , Microsoft.Extensions.Http , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Net.WebSockets.WebSocketProtocol , System.Net.Http.Json , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.IO.Pipelines , System.Net.Http.WinHttpHandler , System.Windows.Extensions , System.Threading.Channels
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20568.2
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime dotnet/efcore [master] Update dependencies from dotnet/efcore dotnet/runtime Nov 18, 2020
@JunTaoLuo
Copy link
Contributor

JunTaoLuo commented Dec 4, 2020

Woot I'm seeing some builds pass!

@JunTaoLuo
Copy link
Contributor

JunTaoLuo commented Dec 4, 2020

Builds are green. Now I'm looking at test failures. I definitely need to fix the sharedfx tests but the others if I can't figure them out promptly, I'll disable them and investigate them separately.

@JunTaoLuo
Copy link
Contributor

JunTaoLuo commented Dec 5, 2020

So now the problem is that we have unexpected assemblies in our shared framework:

System.Text.Json
System.Runtime.CompilerServices.Unsafe
System.Diagnostics.DiagnosticSource
System.Formats.Asn1

I dug through the binlog and saw something suspicious in the ResolvePackageFileConflicts task. Taking System.Format.Asn1 as an example, in the builds before this PR I see the message:

Encountered conflict between 'Platform:System.Formats.Asn1.dll' and 'CopyLocal:C:\Users\johluo\.nuget\packages\system.formats.asn1\6.0.0-alpha.1.20560.10\lib\netstandard2.0\System.Formats.Asn1.dll'. Choosing 'Platform:System.Formats.Asn1.dll' because it is a platform item.

However, in the builds of this PR, I see the following resolution:

Encountered conflict between 'Platform:System.Formats.Asn1.dll' and 'CopyLocal:C:\gh\aspnetcore\.packages\system.formats.asn1\6.0.0-alpha.1.20603.13\lib\netstandard2.0\System.Formats.Asn1.dll'. Choosing 'CopyLocal:C:\gh\aspnetcore\.packages\system.formats.asn1\6.0.0-alpha.1.20603.13\lib\netstandard2.0\System.Formats.Asn1.dll' because file version '6.0.20.60313' is greater than '6.0.0.0'.

Looking at the inputs to the task, I found that there are significant differences in the PlatformManifest.txt:

-System.Formats.Asn1.dll|Microsoft.NETCore.App.Ref|5.0.0.0|6.0.20.56010
+System.Formats.Asn1.dll|Microsoft.NETCore.App.Ref|6.0.0.0|6.0.0.0

It looks like the last entry used to be AssemblyFileVersion but now is not. I assume this is what's causing the task ResolvePackageFileConflicts to pick the assembly from the nuget package instead of the sharedfx which ends up included in our AspNetCore shared framework.

@ericstj @jkoritzinsky is this something that should be fixed on your side?

@jkoritzinsky
Copy link
Member

jkoritzinsky commented Dec 5, 2020

Yes that's on our end. I'll take a look.

@JunTaoLuo
Copy link
Contributor

JunTaoLuo commented Dec 5, 2020

Yea it looks like if I just modify the PlatformManifest so that the AssemblyFileVersion is used, I get the expected result.

= and others added 4 commits December 5, 2020 00:27
Test fixes
5986fab
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
65ceff6 
…1204.10

Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.Platforms , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Runtime.CompilerServices.Unsafe , System.ComponentModel.Annotations , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20604.10
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
3bf5a1a 
…1205.2

Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.Platforms , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Runtime.CompilerServices.Unsafe , System.ComponentModel.Annotations , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20605.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
d3b71e4 
…1206.6

Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.Platforms , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Runtime.CompilerServices.Unsafe , System.ComponentModel.Annotations , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20606.6
@JunTaoLuo JunTaoLuo mentioned this pull request Dec 7, 2020
Closed
@Pilchie
Copy link
Member

Pilchie commented Dec 7, 2020

👀

@jkoritzinsky jkoritzinsky mentioned this pull request Dec 7, 2020
Merged
@jkoritzinsky
Copy link
Member

jkoritzinsky commented Dec 7, 2020

File version fix out at dotnet/arcade#6654. Once that's merged and runtime starts consuming an updated Arcade, then the file version problem will be fixed.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
9fd6610 
…207.4

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20607.4
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/efcore dotnet/runtime [master] Update dependencies from dotnet/runtime dotnet/efcore Dec 7, 2020
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20201…
6a33626 
…207.5

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer
 From Version 6.0.0-alpha.1.20563.8 -> To Version 6.0.0-alpha.1.20607.5
@Tratcher Tratcher removed their request for review December 8, 2020 01:06
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
5dbfe37 
…1208.2

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.IO.Pipelines , System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.ServiceProcess.ServiceController , System.Text.Json , System.Text.Encodings.Web , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20608.2
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime dotnet/efcore [master] Update dependencies from dotnet/efcore dotnet/runtime Dec 8, 2020
@jkoritzinsky jkoritzinsky mentioned this pull request Dec 8, 2020
Closed
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
83804f3 
…1209.2

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.IO.Pipelines , System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.ServiceProcess.ServiceController , System.Text.Json , System.Text.Encodings.Web , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20609.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2020…
d770077 
…1209.11

Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.IO.Pipelines , System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common , System.ServiceProcess.ServiceController , System.Text.Json , System.Text.Encodings.Web , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.20560.10 -> To Version 6.0.0-alpha.1.20609.11
@jkoritzinsky
Copy link
Member

jkoritzinsky commented Dec 9, 2020

@JunTaoLuo the assembly file version fix is in. I've validated that the runtime package now consumed in this PR has the fix.

@dotnet-maestro dotnet-maestro bot merged commit 2ceca7f into master Dec 10, 2020
@dotnet-maestro dotnet-maestro bot deleted the darc-master-9396423e-d0e5-4256-b391-f59a31dec46d branch December 10, 2020 02:10
@sdmaclea
Copy link
Contributor

sdmaclea commented Dec 10, 2020

Woo Hoo! thanks all

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BrennanConroy BrennanConroy BrennanConroy left review comments

@javiercn javiercn Awaiting requested review from javiercn

@SteveSandersonMS SteveSandersonMS Awaiting requested review from SteveSandersonMS

@halter73 halter73 Awaiting requested review from halter73

@jkotalik jkotalik Awaiting requested review from jkotalik

+2 more reviewers

@dougbu dougbu dougbu left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.