Skip to content
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

[main] Update dependencies from dotnet/runtime dotnet/efcore #48014

Merged
merged 16 commits into from
May 5, 2023
Merged

[main] Update dependencies from dotnet/runtime dotnet/efcore #48014

merged 16 commits into from
May 5, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 2, 2023 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: 8ce5251e-8269-419d-3b2a-08d8b8050dda
  • Build: 20230504.6
  • Date Produced: May 4, 2023 10:08:18 PM UTC
  • Commit: f8800f1642c7cad484ba47bcf2ebf469effa1257
  • Branch: refs/heads/main

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

  • Subscription: 32db3699-5666-45da-a1b7-08d8b804cd75
  • Build: 20230504.1
  • Date Produced: May 4, 2023 10:32:24 AM UTC
  • Commit: 3232ad36a791b7b8dce81c3358cd6cec4e42c06e
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20230…
5ea1e00 
…501.6

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-preview.5.23229.3 -> To Version 8.0.0-preview.5.23251.6
@dotnet-maestro dotnet-maestro bot requested review from a team and wtgodbe as code owners May 2, 2023 00:24
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 2, 2023
ghost
ghost approved these changes May 2, 2023
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.

@ghost
Copy link

ghost commented May 2, 2023

Hey @dotnet/aspnet-build, looks like this PR is something you want to take a look at.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2023…
a0e3261 
…0502.1

Microsoft.Bcl.AsyncInterfaces , 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.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , 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.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting
 From Version 8.0.0-preview.5.23251.1 -> To Version 8.0.0-preview.5.23252.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore [main] Update dependencies from dotnet/efcore dotnet/runtime May 2, 2023
@Tratcher
Copy link
Member

Tratcher commented May 2, 2023 •
edited
Loading

Windows and linux both reported:
2023-05-02T13:21:42.0582181Z [xUnit.net 00:14:28.55] Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests: [Long Running Test] 'Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.QuicStreamContextTests.BidirectionalStream_ServerWritesDataAndDisposes_ClientReadsData(dataLength: 5242880)', Elapsed: 00:14:13

The logs are also getting spammed with

[11.597s] HttpEventSourceListener Debug: <- Event Private.InternalDiagnostics.System.Net.Quic - Info : QuicStream#2681320,ReadAsync,[strm][0x557EF1082240] Stream reading into memory of '1024' bytes. ->

@MihaZupan @JamesNK

@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20230…
04b5649 
…502.13

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-preview.5.23229.3 -> To Version 8.0.0-preview.5.23252.13
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/efcore May 2, 2023
@JamesNK
Copy link
Member

JamesNK commented May 3, 2023

Looks like the test aborted because it wrote too many longs.

There haven't been any HTTP/3 changes recently in aspnetcore. Has something changed in System.Net.Quic?

@JamesNK
Copy link
Member

JamesNK commented May 3, 2023

cc @dotnet/ncl

dotnet-maestro bot added 2 commits May 3, 2023 05:18
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20230…
abb1ed0 
…502.14

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-preview.5.23229.3 -> To Version 8.0.0-preview.5.23252.14
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2023…
38b69bb 
…0502.13

Microsoft.Bcl.AsyncInterfaces , 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.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , 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.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting
 From Version 8.0.0-preview.5.23251.1 -> To Version 8.0.0-preview.5.23252.13
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/efcore [main] Update dependencies from dotnet/efcore dotnet/runtime May 3, 2023
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20230…
4fc4a4d 
…503.1

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-preview.5.23229.3 -> To Version 8.0.0-preview.5.23253.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/efcore May 3, 2023
dotnet-maestro bot added 2 commits May 3, 2023 21:48
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20230…
ed86d27 
…503.4

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-preview.5.23229.3 -> To Version 8.0.0-preview.5.23253.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2023…
26186fd 
…0504.1

Microsoft.Bcl.AsyncInterfaces , 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.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , 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.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting
 From Version 8.0.0-preview.5.23251.1 -> To Version 8.0.0-preview.5.23254.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/efcore [main] Update dependencies from dotnet/efcore dotnet/runtime May 4, 2023
This was referenced May 4, 2023
Merged
Merged
@jkoritzinsky
Copy link
Member

Yep. All you need to do is make the parameterless constructors on those SafeHandle types public. I'll fix it when I get into the office.

This was referenced May 4, 2023
Closed
Merged
@lewing
Copy link
Member

lewing commented May 4, 2023 •
edited
Loading

this appears to be failing on #48022 now?

cc @eerhardt @Tratcher

@eerhardt
Copy link
Member

eerhardt commented May 4, 2023

These tests are passing on main without this change.

Looking at the console log: https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-aspnetcore-refs-pull-48014-merge-4a266699aebe459c98/Templates.Tests--net8.0/4/console.389520cd.log?helixlogtype=result

Unhandled Exception: System.TypeLoadException: Could not load type 'System.Buffers.SearchValues`1' from assembly 'System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.

I believe this is the same problem we had when first enabling these tests. The tests are using the runtime version that comes with the SDK and not the runtime version that ASP.NET is building against.

This is basically dotnet/runtime#84372 again. We need a supported way to say "publish this app using XXX daily build of the runtime". cc @agocke @sbomer

We can try to use the workaround we've been using:

aspnetcore/eng/testing/linker/SupportFiles/Directory.Build.targets

Lines 8 to 15 in e422fd3

<!-- needed to reference a specific version of NetCoreApp. Workaround https://github.com/dotnet/runtime/issues/81382 -->
<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)" />
<PackageReference Include="Microsoft.Dotnet.ILCompiler"
Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
</ItemGroup>

But it would be a lot better if we could just set 1 property instead of propagating this workaround more.

@eerhardt
Copy link
Member

eerhardt commented May 4, 2023

cc @mitchdenny for the template tests

@lewing
Copy link
Member

lewing commented May 4, 2023

that makes sense, it is also unfortunate since runtime->sdk and separately sdk->installer are blocked on this pr

@wtgodbe
Copy link
Member

wtgodbe commented May 4, 2023

The rest of our template tests get that workaround, what are these template tests doing differently?

@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20230…
25c6aea 
…504.6

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-preview.5.23229.3 -> To Version 8.0.0-preview.5.23254.6
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/efcore May 4, 2023
@eerhardt
Copy link
Member

eerhardt commented May 4, 2023

The rest of our template tests get that workaround

Not the full workaround. They only do the 1st part:

aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in

Lines 30 to 38 in e422fd3

<!--
Reference base shared framework at incoming dependency flow version, not bundled sdk version.
Apply this to all projects that target the default tfm (e.g. net8.0) or a rid-based variant of it (e.g. net8.0-windows)
-->
<FrameworkReference
Update="Microsoft.NETCore.App"
Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
RuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />

what are these template tests doing differently?

Publishing for Native AOT. The runtime reference when publishing for AOT also needs the explicit Microsoft.Dotnet.ILCompiler reference to get the right version. Check out the issue I linked above: dotnet/runtime#84372. There is also dotnet/runtime#81382 which is roughly the same issue.

@lewing lewing enabled auto-merge (squash) May 5, 2023 00:53
@RussKie
Copy link
Member

RussKie commented May 5, 2023

Templates.Tes still failing with:

C:hwAFAC094Cw9DAF08CFeTemplatesBaseFolderAspNet.yokn0xvhnnnsAspNet.yokn0xvhnnns.csproj : error NU1604: Warning As Error: Project dependency Microsoft.Dotnet.ILCompiler does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results.

@RussKie RussKie force-pushed the darc-main-6d293505-ab46-4893-aaa8-3f1828bbdebf branch from 9c27e51 to ae91643 Compare May 5, 2023 02:14
@mitchdenny
Copy link
Member

Even getting the version right didn't fix it. It looks like it is designed to error when we reference a version of ILCompiler. I've added the following build property to try and disable that warning:

aspnetcore/eng/tools/GenerateFiles/Directory.Build.props.in

Line 9 in 708cbc9

<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>

@mitchdenny
Copy link
Member

For some reason I can't build the project templates locally due to a Blazor issue which is slowing down this process.

@RussKie
Copy link
Member

RussKie commented May 5, 2023

For some reason I can't build the project templates locally due to a Blazor issue which is slowing down this process.

I vaguely remember there should be a way to kick off a helix job from your workstation and it'd execute remotely. You'll just have to wait for the result....

@lewing lewing merged commit c636106 into main May 5, 2023
@lewing lewing deleted the darc-main-6d293505-ab46-4893-aaa8-3f1828bbdebf branch May 5, 2023 07:45
@ghost ghost added this to the 8.0-preview5 milestone May 5, 2023
@halter73 halter73 mentioned this pull request Jun 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mitchdenny mitchdenny mitchdenny left review comments

@RussKie RussKie RussKie left review comments

@wtgodbe wtgodbe Awaiting requested review from wtgodbe wtgodbe is a code owner

@Tratcher Tratcher Awaiting requested review from Tratcher

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy BrennanConroy is a code owner

@javiercn javiercn Awaiting requested review from javiercn

@halter73 halter73 Awaiting requested review from halter73 halter73 is a code owner

@captainsafia captainsafia Awaiting requested review from captainsafia captainsafia is a code owner

@JamesNK JamesNK Awaiting requested review from JamesNK JamesNK is a code owner

@mgravell mgravell Awaiting requested review from mgravell mgravell is a code owner

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
8.0-preview5
Development

Successfully merging this pull request may close these issues.
9 participants
@Tratcher @JamesNK @lewing @jkoritzinsky @eerhardt @wtgodbe @RussKie @mitchdenny @MihaZupan