-
Notifications
You must be signed in to change notification settings - Fork 10.1k
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.
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
[main] Update dependencies from dotnet/efcore dotnet/runtime #34033
[main] Update dependencies from dotnet/efcore dotnet/runtime #34033
Conversation
…0702.2 Microsoft.Win32.SystemEvents , 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.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common From Version 6.0.0-preview.7.21351.2 -> To Version 6.0.0-preview.7.21352.2
There was a problem hiding this 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.
@ericstj @pranavkm - the errors look interesting:
Could this have been caused by dotnet/runtime#54950? |
👀 |
It looks like the analyzer appears both as part of the Logging.Abstractions package and the Internal transport feed. I tried setting Could we remove the source generator from the transport package instead? It's an internal detail, no? |
I think the right option is to use the transport package to get the source generator. It should then be automatically included in our targeting packs. But, I defer to @ericstj because he did #33977 for us. |
@@ -59,4 +59,11 @@ | |||
<RazorReferencePath Include="@(ReferencePathWithRefAssemblies)" /> | |||
</ItemGroup> | |||
</Target> | |||
|
|||
<!-- Work around https://github.com/dotnet/aspnetcore/issues/34048 --> | |||
<Target Name="_RemoveDuplicateLoggingSourceGenerator" AfterTargets="ResolvePackageAssets" Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dougbu I did a random workaround because I couldn't get PrivateAssets
/ ExcludeAssets
to work for some reason. Could you have a look and see if there's a better way to do this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks about right b/c Logging.Abstractions is referenced transitively so often. But, I'd like to hear from @ericstj why the offending assembly is duplicated between Logging.Abstractions and our transport package.
@@ -11,7 +11,6 @@ | |||
|
|||
<ItemGroup> | |||
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" /> | |||
<Reference Include="Microsoft.Extensions.Logging.Abstractions" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This references are brought in from the transport package. Having / removing it does nothing, but it seemed unnecessary.
…0702.16 Microsoft.Win32.SystemEvents , 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.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common From Version 6.0.0-preview.7.21351.2 -> To Version 6.0.0-preview.7.21352.16
I'm not sure but the build failures seem to come from newly-added analyzers in dotnet/runtime. The compilation errors may be real. |
…0705.1 Microsoft.Win32.SystemEvents , 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.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common From Version 6.0.0-preview.7.21351.2 -> To Version 6.0.0-preview.7.21355.1
…705.1 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.7.21351.1 -> To Version 6.0.0-preview.7.21355.1
…0706.2 Microsoft.Win32.SystemEvents , 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.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.IO.Pipelines , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Drawing.Common From Version 6.0.0-preview.7.21351.2 -> To Version 6.0.0-preview.7.21356.2
@pranavkm @captainsafia do you happen to have any context on the
|
Spoke offline, 51dfc46 should resolve the |
FYI it's usually not necessary to do a manual merge unless there were conflicts before. |
Given the time sensitive nature of getting this PR in, shouldn't we unblock and then investigate? |
Hey Team... I really appreciate all the energy going into this. It seems to me (and @davidfowl who i chatted with offline) that in this case, we aren't in too much danger of a quality downward spiral if we unblock and then coordinate on monday morning to get this cleaned up. |
We're gonna need to have an all hands on deck tomorrow to solve this issue. Seems like some people with context are out. @dougbu, @captainsafia , @HaoK do we think this affects publishing in general ? |
I create #34272 to follow-up on some the template test changes that were made here.
The template tests running in the non-Helix environment appear to be passing, although that doesn't say much IMO. :/ There's a new blocker on this PR that seems to be related to an exception in the test discovery code so that'll likely need to be handled before it goes in. We'll probably need to spend tomorrow looking at that + the template test failures and figuring out the smoothest way to resolve this PR. |
Ugh test discovery failures, well if the actual runs don't fail, we can probably temporarily just turn off the test discovery check which should be harmless in the short term: Just comment out https://github.com/dotnet/aspnetcore/blob/main/eng/helix/content/RunTests/Program.cs#L35 |
@HaoK I pushed a change that reverts the use of dotnet test and comments out test discovery for now. |
.azure/pipelines/helix-matrix.yml
Outdated
@@ -40,7 +40,7 @@ jobs: | |||
displayName: Restore interop projects | |||
- script: .\eng\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj | |||
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true | |||
/p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log | |||
/p:RunTemplateTests=false /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Assuming something else fails and we we need another build, we should probably revert this as its not needed now that we don't build the template tests on helix, so its one less thing to remember to undo in the future
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just did this.
This reverts commit 2136f31.
@HaoK can you take a look those 2 latest changes and tell me if there's anything else that needs to be done? |
This was the failure on the previous run:
|
I saw that failure on the quarantined-pr pipeline too, I believe that's just the build race with the components test app that's we've been dealing with for a while, did the normal helix job succeed on the previous run? If so then I think things look good enough for now |
Yay a new failure:
|
Hopefully those generics were what was causing test discovery to fail too |
Should I undo that change too? |
Nah, this PR (hopefully) almost looks green, easy enough to try turning on the test discovery again when we do cleanup/investigations after this gets in |
I think it's hung, the helix tests usually take an hour |
Socket tests on OSX https://helix.dot.net/api/jobs/2cd5acf8-e6f6-4a02-972d-b0951480dc03/workitems?api-version=2019-06-17 VS test is saying that helix is lying about the fact that all of the tests ran: {
"Version": 2,
"MessageType": "TestExecution.Completed",
"Payload": {
"TestRunCompleteArgs": {
"TestRunStatistics": {
"ExecutedTests": 58,
"Stats": {
"Skipped": 5,
"Passed": 53
}
},
"IsCanceled": false,
"IsAborted": false,
"Error": null,
"AttachmentSets": [],
"ElapsedTimeInRunningTests": "00:00:55.5773967",
"Metrics": {}
},
"RunAttachments": [],
"ExecutorUris": [
"executor://xunit/VsTestRunner2/netcoreapp"
]
}
} I'm gonna blame the infrastructure on this one until further notice. |
This is a valid assignment of blame, I fear. It's https://github.com/dotnet/core-eng/issues/12275. Basically, we have no idea how long to allow uploading to take (on these on-prem machines, multi-gig dump files cause all sorts of havoc sometimes) so we stop the special "what if the thread doing the uploading hangs?" timer A mitigation is simple, and feel free to advocate for this on the issue... if we were to say somewhere "all work item uploads must finish in n minutes", then we can just set the timer appropriately and recover when this occurs. It's extremely rare though, so thus far the issue hasn't been dealt with. |
Hi @MattGal. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context. |
This pull request updates the following dependencies
From https://github.com/dotnet/runtime
From https://github.com/dotnet/efcore