Skip to content

[release/6.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore - #33571

Merged
dotnet-maestro[bot] merged 22 commits into
release/6.0-preview6from
darc-release/6.0-preview6-f9dc95a8-4e54-433f-8ca5-7b23c09f1968
Jun 18, 2021
Merged

[release/6.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore#33571
dotnet-maestro[bot] merged 22 commits into
release/6.0-preview6from
darc-release/6.0-preview6-f9dc95a8-4e54-433f-8ca5-7b23c09f1968

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

This pull request updates the following dependencies

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

  • Subscription: ffec033b-0c28-40f4-cd08-08d9301a11ed
  • Build: 20210617.1
  • Date Produced: 6/17/2021 6:41 PM
  • Commit: c29922e82e3e0d84e8db0fbd6008b26d0c36e74e
  • Branch: refs/heads/release/6.0-preview6

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

  • Subscription: 63eff656-a458-4157-fa66-08d9301a7519
  • Build: 20210617.4
  • Date Produced: 6/17/2021 5:15 PM
  • Commit: 01188c75f06412dc86508e7b653deaeace9623ba
  • Branch: refs/heads/release/6.0-preview6

…615.13

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-preview.6.21315.1 -> To Version 6.0.0-preview.6.21315.13
@dotnet-maestro
dotnet-maestro Bot requested a review from dougbu as a code owner June 16, 2021 00:57
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels Jun 16, 2021

@ghost ghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Auto-approving dependency update.

@ghost ghost added the tell-mode Indicates a PR which is being merged during tell-mode label Jun 16, 2021
…0615.7

Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.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.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.AspNetCore.Internal.Transport , 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.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.Extensions.Hosting , Microsoft.Extensions.Configuration.Ini , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Ref , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols
 From Version 6.0.0-preview.6.21314.2 -> To Version 6.0.0-preview.6.21315.7
@dotnet-maestro dotnet-maestro Bot changed the title [release/6.0-preview6] Update dependencies from dotnet/efcore [release/6.0-preview6] Update dependencies from dotnet/efcore dotnet/runtime Jun 16, 2021
…616.3

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-preview.6.21315.1 -> To Version 6.0.0-preview.6.21316.3
@dotnet-maestro dotnet-maestro Bot changed the title [release/6.0-preview6] Update dependencies from dotnet/efcore dotnet/runtime [release/6.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore Jun 16, 2021
@dougbu

dougbu commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

Needs a reaction to dotnet/runtime#54147. I'm working on it…

- remove newly-unnecessary package references
- do not expect affected assemblies in _our_ targeting packs
@dougbu

dougbu commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

I doubt the commit I added will be enough. Expect we need "@(SuppressBaselineReference) items in at least Microsoft.AspNetCore.DataProtection.csproj. Also expect we'll see at least some changes in the shared Fx to continue. Checking the latest packages from dotnet/runtime in parallel w/ the pipeline run…

@dougbu

dougbu commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

@dotnet/aspnet-build please keep an eye on this because I'm not sure we're done reacting. I need to run an errand…

@wtgodbe

wtgodbe commented Jun 16, 2021

Copy link
Copy Markdown
Member

Getting Helix failures (only Helix) in PlatformManifestListsAllFiles

Assert.Empty() Failure
Collection: ["Microsoft.Win32.SystemEvents", "System.Drawing.Common", "System.Security.Permissions", "System.Windows.Extensions"]
at Microsoft.AspNetCore.TargetingPackTests.PlatformManifestListsAllFiles() in /_/src/Framework/test/TargetingPackTests.cs:line 282

SharedFrameworkContainsListedAssemblies

Assert.Empty() Failure
Collection: ["Microsoft.Win32.SystemEvents", "System.Drawing.Common", "System.Security.Permissions", "System.Windows.Extensions"]
at Microsoft.AspNetCore.SharedFxTests.SharedFrameworkContainsListedAssemblies() in /_/src/Framework/test/SharedFxTests.cs:line 61

And similar tests

@wtgodbe

wtgodbe commented Jun 16, 2021

Copy link
Copy Markdown
Member

@dougbu is it expected that we now need to add"Microsoft.Win32.SystemEvents", "System.Drawing.Common", "System.Security.Permissions", "System.Windows.Extensions" toListedSharedFxAssemblies in TestData? That is, those assemblies are now in the Shared Framework (and targeting pack)

@pranavkm

Copy link
Copy Markdown
Contributor

We'd done some work to remove those assemblies from the shared fx / targeting pack: aspnet/Announcements#456. @ericstj are they supposed to be back?

@dougbu

dougbu commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

/cc @ViktorHofer why are we getting more assemblies in Microsoft.AspNetCore.App.Runtime.*❔

@dougbu

dougbu commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

Hmm, we exclude Microsoft.Win32.SystemEvents, System.Drawing.Common, System.Security.Permissions, and System.Windows.Extensions from the targeting packs (along w/ System.Security.Cryptography.Pkcs). Maybe we need something similar for the shared Fx❔

@wtgodbe

wtgodbe commented Jun 16, 2021

Copy link
Copy Markdown
Member

The targeting pack tests are failing the same way, also only on Helix

@dougbu

dougbu commented Jun 16, 2021

Copy link
Copy Markdown
Contributor

The targeting pack tests are failing the same way, also only on Helix

  1. These tests should only run on Helix
  2. The targeting pack tests are failing due to the extra assemblies in the shared Fx / platform manifest.

@ViktorHofer

Copy link
Copy Markdown
Member

We'd done some work to remove those assemblies from the shared fx / targeting pack: aspnet/Announcements#456. @ericstj are they supposed to be back?

We exposed the following reference assemblies in the Microsoft.NETCore.App.Ref targeting pack:

  • Microsoft.Win32.Registry
  • System.IO.FileSystem.AccessControl
  • System.IO.Pipes.AccessControl
  • System.Security.AccessControl
  • System.Security.Principal.Windows

All of these shouldn't be present in your targeting/runtime pack as Microsoft.NETCore.App.* exposes them now.

@dotnet-maestro dotnet-maestro Bot changed the title [release/6.0-preview6] Update dependencies from dotnet/efcore dotnet/runtime [release/6.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore Jun 17, 2021
@dougbu

dougbu commented Jun 17, 2021

Copy link
Copy Markdown
Contributor

Might need your help here @dougbu, I'm wrestling with representing this change.

I think we're making a bad situation worse if we remove 6.0 packages that may otherwise need to be serviced in the future. Switching to 5.0 versions doesn't help much because it will be a manual process to update them going forward. I'd much rather have 6.0 packages, perhaps ones that no longer contain .NET Core assemblies.

@ericstj

ericstj commented Jun 17, 2021

Copy link
Copy Markdown
Member

I think we're making a bad situation worse if we remove 6.0 packages that may otherwise need to be serviced in the future. Switching to 5.0 versions doesn't help much because it will be a manual process to update them going forward. I'd much rather have 6.0 packages, perhaps ones that no longer contain .NET Core assemblies.

Servicing is unlikely. The packages have reference assemblies and full facades for .NETFramework. On .NETCore these were all part of the framework already so we already service them in the shared framework. The packages were just giving you reference assemblies.

ericstj added 2 commits June 17, 2021 15:28
This was present in the previous release and shouldn't be removed since
this is part of the public contract of the netstandard2.0 build of DataProtection.
@ericstj

ericstj commented Jun 17, 2021

Copy link
Copy Markdown
Member

Also, this is the same mode that all of the following packages are already in:

<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>

<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
<NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
<SystemBuffersVersion>4.5.0</SystemBuffersVersion>
<SystemCodeDomVersion>4.4.0</SystemCodeDomVersion>
<SystemCommandlineExperimentalVersion>0.3.0-alpha.19317.1</SystemCommandlineExperimentalVersion>
<SystemComponentModelVersion>4.3.0</SystemComponentModelVersion>
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
<SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemThreadingTasksExtensionsVersion>4.5.3</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>

@ericstj

ericstj commented Jun 17, 2021

Copy link
Copy Markdown
Member

Looks like this one might be a winner 🤞

@dougbu dougbu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suspect we need a @(SuppressBaselineReference) item or two for Microsoft.Win32.Registry references we're removing

Comment thread src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj Outdated
Comment thread src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj Outdated
Comment thread src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj Outdated
Comment thread src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj Outdated
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
@dougbu

dougbu commented Jun 17, 2021

Copy link
Copy Markdown
Contributor

@ericstj I agree we have a few dependencies on old versions of dead-ended packages. Was calling this out as potentially problematic, not to imply it's a new thing.

In any case,

The packages were just giving you reference assemblies.

I thought the packages also contained netstandard assemblies w/ real implementations❔

@dougbu

dougbu commented Jun 17, 2021

Copy link
Copy Markdown
Contributor

Oops, I'll fix the current failures up in a minute. Requires a change to eng/Dependencies.props.

Comment thread src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj Outdated
dougbu added a commit that referenced this pull request Jun 18, 2021
- add excluded System.Security.Permissions references
- stop auto-updating dead-ended packages
  - switch to 5.0.0 version of Microsoft.Win32.Registry
  - switch to 5.0.0 version of System.Security.Principal.Windows
Comment thread src/Testing/src/Microsoft.AspNetCore.Testing.csproj
@ericstj

ericstj commented Jun 18, 2021

Copy link
Copy Markdown
Member

My assumption about the precedence of ExcludeAssets being transitive was wrong. Since the dependencies of SSP are transitive it lets the non-excluded references win over those marked with exclude. To workaround we need to add all of them.

@ericstj

ericstj commented Jun 18, 2021

Copy link
Copy Markdown
Member

I thought the packages also contained netstandard assemblies w/ real implementations❔

Sure, but these are typically ignored on .NETCore since the shared-framework should have a higher version. There aren't going to be any in-support .NETCore frameworks that use that asset eventually, so it's a point in time problem that we care about servicing the package (until net5.0 is out of support). I think this is a necessary period that we need to work through to dead end packages, otherwise we will ship / support them forever.

Comment thread eng/Dependencies.props
<LatestPackageReference Include="Microsoft.Win32.SystemEvents" />
<LatestPackageReference Include="System.Drawing.Common" />
<LatestPackageReference Include="System.Security.Permissions" />
<LatestPackageReference Include="System.Windows.Extensions" />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Need the three of these that aren't already in eng/Version.Details.xml to either use 5.0.0 versions (and move out of the automated section of eng/Versions.props) or be included in eng/Version.Details.xml.

@ericstj ericstj Jun 18, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These all still build live, so they can be included in the main section. These should all be temporary until dotnet/runtime#54341 is addressed. IMHO it's worth carrying this package (System.Security.AccessControl) for one more release to make the type move. I'd like to hear @ViktorHofer's thoughts.

Comment thread eng/Version.Details.xml
Comment thread eng/Version.Details.xml
Comment thread eng/Version.Details.xml
dougbu pushed a commit that referenced this pull request Jun 18, 2021
dougbu added a commit that referenced this pull request Jun 18, 2021
- cherry-picked from #33571
@dotnet-maestro
dotnet-maestro Bot merged commit 2c996cf into release/6.0-preview6 Jun 18, 2021
@dotnet-maestro
dotnet-maestro Bot deleted the darc-release/6.0-preview6-f9dc95a8-4e54-433f-8ca5-7b23c09f1968 branch June 18, 2021 03:27
@dougbu

dougbu commented Jun 18, 2021

Copy link
Copy Markdown
Contributor

Hurray❕ Many thanks to @ericstj and everyone else involved in this long slog.

dotnet-maestro Bot added a commit that referenced this pull request Jun 18, 2021
[main] Update dependencies from dotnet/runtime dotnet/efcore


 - React to dotnet/runtime#54147
- remove newly-unnecessary package references
- do not expect affected assemblies in _our_ targeting packs

 - Add baseline suppression

 - !fixup! Suppress correct reference

 - Manually align w/ #33571
- add excluded System.Security.Permissions references
- stop auto-updating dead-ended packages
  - switch to 5.0.0 version of Microsoft.Win32.Registry
  - switch to 5.0.0 version of System.Security.Principal.Windows

 - Suppress all of System.Security.Permissions dependency closure
- cherry-picked from #33571

 - Add missing dependencies
- cherry-picked from #33571
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode Type: Dependency Update 🔼

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants