From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 17:59:14 +0000 (-0700) Subject: [main] Update dependencies from dotnet/aspnetcore (#4638) X-Git-Tag: accepted/tizen/unified/20241231.014852~40^2~56 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b50fca6e1024c29a41319df0729724dbe628dc4e;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git [main] Update dependencies from dotnet/aspnetcore (#4638) This pull request updates the following dependencies [marker]: <> (Begin:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb) ## From https://github.com/dotnet/aspnetcore - **Subscription**: e96c3e1a-afbc-49f7-37c9-08dc4e3803cb - **Build**: 20240522.7 - **Date Produced**: May 23, 2024 1:43:26 AM UTC - **Commit**: 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0-preview.4.24222.16 to 9.0.0-preview.6.24272.7][29] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.0-preview.4.24222.16 to 9.0.0-preview.6.24272.7][29] [29]: https://github.com/dotnet/aspnetcore/compare/576f7cb8ec...49c1c68bf1 [DependencyUpdate]: <> (End) [marker]: <> (End:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb) --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> Co-authored-by: Mike McLaughlin Co-authored-by: Juan Sebastian Hoyos Ayala --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd9b124b9..9dfa03c91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,13 +32,13 @@ https://github.com/dotnet/installer fa261b952d702c6bd604728fcbdb58ac071a22b1 - + https://github.com/dotnet/aspnetcore - 576f7cb8ec5aed536319bcc65ad4ec34149b5a16 + 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b - + https://github.com/dotnet/aspnetcore - 576f7cb8ec5aed536319bcc65ad4ec34149b5a16 + 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b https://github.com/dotnet/runtime @@ -54,21 +54,21 @@ 0df72d85186994facaefcb4eb832b8c8a8e5ae3d - + https://github.com/dotnet/roslyn - 6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1 + 40e6b96cad11400acb5b8999057ac8ba748df940 - + https://github.com/dotnet/roslyn - 6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1 + 40e6b96cad11400acb5b8999057ac8ba748df940 - + https://github.com/dotnet/roslyn-analyzers - 76d99c5f3e11f0600fae074270c0d89042c360f0 + 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/roslyn-analyzers - 76d99c5f3e11f0600fae074270c0d89042c360f0 + 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 diff --git a/eng/Versions.props b/eng/Versions.props index ce27a3f90..c1bb34a6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,14 +19,16 @@ 9.0.0-preview.5.24273.1 9.0.0-preview.5.24273.1 - 9.0.0-preview.4.24222.16 - 9.0.0-preview.4.24222.16 + 9.0.0-preview.6.24272.7 + 9.0.0-preview.6.24272.7 9.0.100-preview.5.24253.16 false + + 5.0.0 6.0.0 @@ -56,6 +58,15 @@ 13.0.1 9.0.0-alpha.1.24270.1 + + + 4.11.0-2.24271.11 + 4.11.0-2.24271.11 + 4.11.0-2.24271.11 3.11.0 @@ -66,7 +77,7 @@ It should never go ahead of the Roslyn version included in the SDK version in dotnet/arcade's global.json to avoid causing breaks in product construction. --> 4.4.0 - 4.4.0 + 4.8.0 $(MicrosoftCodeAnalysisVersion) 3.11.0-beta1.23420.2 8.0.0-preview.23420.2 @@ -74,17 +85,8 @@ These packages affect the design-time experience in VS, so we update them at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version. --> $(MicrosoftCodeAnalysisVersion_LatestVS) - - - 4.8.0-2.23422.14 - 4.8.0-2.23422.14 - 4.8.0-2.23422.14 - 8.0.5 diff --git a/global.json b/global.json index 45f681ccd..0db05bacf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.3.24204.13", + "dotnet": "9.0.100-preview.4.24267.66", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreApp60Version)", diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/CpuProfileConfiguration.cs b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/CpuProfileConfiguration.cs index 14ca871db..1d56fb729 100644 --- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/CpuProfileConfiguration.cs +++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/CpuProfileConfiguration.cs @@ -11,8 +11,8 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe public override IList GetProviders() => new EventPipeProvider[] { - new EventPipeProvider(SampleProfilerProviderName, System.Diagnostics.Tracing.EventLevel.Informational), - new EventPipeProvider("Microsoft-Windows-DotNETRuntime", System.Diagnostics.Tracing.EventLevel.Informational, (long) Tracing.Parsers.ClrTraceEventParser.Keywords.Default) + new(SampleProfilerProviderName, System.Diagnostics.Tracing.EventLevel.Informational), + new("Microsoft-Windows-DotNETRuntime", System.Diagnostics.Tracing.EventLevel.Informational, (long) Tracing.Parsers.ClrTraceEventParser.Keywords.Default) }; } } diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/GcCollectConfiguration.cs b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/GcCollectConfiguration.cs index bd17a6212..6d8ebd0b0 100644 --- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/GcCollectConfiguration.cs +++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/GcCollectConfiguration.cs @@ -17,8 +17,8 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe public override IList GetProviders() => new EventPipeProvider[] { - new EventPipeProvider("Microsoft-Windows-DotNETRuntime", System.Diagnostics.Tracing.EventLevel.Informational, (long) Tracing.Parsers.ClrTraceEventParser.Keywords.GC), - new EventPipeProvider("Microsoft-Windows-DotNETRuntimePrivate", System.Diagnostics.Tracing.EventLevel.Informational, (long) Tracing.Parsers.ClrTraceEventParser.Keywords.GC), + new("Microsoft-Windows-DotNETRuntime", System.Diagnostics.Tracing.EventLevel.Informational, (long) Tracing.Parsers.ClrTraceEventParser.Keywords.GC), + new("Microsoft-Windows-DotNETRuntimePrivate", System.Diagnostics.Tracing.EventLevel.Informational, (long) Tracing.Parsers.ClrTraceEventParser.Keywords.GC), }; } } diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/SampleProfilerConfiguration.cs b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/SampleProfilerConfiguration.cs index 19f89c99f..42e06143b 100644 --- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/SampleProfilerConfiguration.cs +++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/SampleProfilerConfiguration.cs @@ -18,7 +18,7 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe public override IList GetProviders() => new EventPipeProvider[] { - new EventPipeProvider(SampleProfilerProviderName, EventLevel.Informational) + new(SampleProfilerProviderName, EventLevel.Informational) }; public override int BufferSizeInMB => 1; diff --git a/src/Tools/dotnet-gcdump/DotNetHeapDump/EventPipeDotNetHeapDumper.cs b/src/Tools/dotnet-gcdump/DotNetHeapDump/EventPipeDotNetHeapDumper.cs index 4d8a40c6b..5eaf9bce4 100644 --- a/src/Tools/dotnet-gcdump/DotNetHeapDump/EventPipeDotNetHeapDumper.cs +++ b/src/Tools/dotnet-gcdump/DotNetHeapDump/EventPipeDotNetHeapDumper.cs @@ -132,7 +132,7 @@ namespace Microsoft.Diagnostics.Tools.GCDump log.WriteLine("{0,5:n1}s: Creating type table flushing task", getElapsed().TotalSeconds); using (EventPipeSessionController typeFlushSession = new(processId, diagnosticPort, new List { - new EventPipeProvider("Microsoft-DotNETCore-SampleProfiler", EventLevel.Informational) + new("Microsoft-DotNETCore-SampleProfiler", EventLevel.Informational) }, false)) { log.WriteLine("{0,5:n1}s: Flushing the type table", getElapsed().TotalSeconds); @@ -157,7 +157,7 @@ namespace Microsoft.Diagnostics.Tools.GCDump log.WriteLine("{0,5:n1}s: Requesting a .NET Heap Dump", getElapsed().TotalSeconds); using EventPipeSessionController gcDumpSession = new(processId, diagnosticPort, new List { - new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Verbose, (long)(ClrTraceEventParser.Keywords.GCHeapSnapshot)) + new("Microsoft-Windows-DotNETRuntime", EventLevel.Verbose, (long)(ClrTraceEventParser.Keywords.GCHeapSnapshot)) }); log.WriteLine("{0,5:n1}s: gcdump EventPipe Session started", getElapsed().TotalSeconds); diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/ListProfilesCommandHandler.cs b/src/Tools/dotnet-trace/CommandLine/Commands/ListProfilesCommandHandler.cs index c583e4a14..a25f86324 100644 --- a/src/Tools/dotnet-trace/CommandLine/Commands/ListProfilesCommandHandler.cs +++ b/src/Tools/dotnet-trace/CommandLine/Commands/ListProfilesCommandHandler.cs @@ -45,14 +45,14 @@ namespace Microsoft.Diagnostics.Tools.Trace new Profile( "cpu-sampling", new EventPipeProvider[] { - new EventPipeProvider("Microsoft-DotNETCore-SampleProfiler", EventLevel.Informational), - new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Informational, (long)ClrTraceEventParser.Keywords.Default) + new("Microsoft-DotNETCore-SampleProfiler", EventLevel.Informational), + new("Microsoft-Windows-DotNETRuntime", EventLevel.Informational, (long)ClrTraceEventParser.Keywords.Default) }, "Useful for tracking CPU usage and general .NET runtime information. This is the default option if no profile or providers are specified."), new Profile( "gc-verbose", new EventPipeProvider[] { - new EventPipeProvider( + new( name: "Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Verbose, keywords: (long)ClrTraceEventParser.Keywords.GC | @@ -64,12 +64,12 @@ namespace Microsoft.Diagnostics.Tools.Trace new Profile( "gc-collect", new EventPipeProvider[] { - new EventPipeProvider( + new( name: "Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Informational, keywords: (long)ClrTraceEventParser.Keywords.GC ), - new EventPipeProvider( + new( name: "Microsoft-Windows-DotNETRuntimePrivate", eventLevel: EventLevel.Informational, keywords: (long)ClrTraceEventParser.Keywords.GC @@ -79,12 +79,12 @@ namespace Microsoft.Diagnostics.Tools.Trace new Profile( "database", new EventPipeProvider[] { - new EventPipeProvider( + new( name: "System.Threading.Tasks.TplEventSource", eventLevel: EventLevel.Informational, keywords: (long)TplEtwProviderTraceEventParser.Keywords.TasksFlowActivityIds ), - new EventPipeProvider( + new( name: "Microsoft-Diagnostics-DiagnosticSource", eventLevel: EventLevel.Verbose, keywords: (long)DiagnosticSourceKeywords.Messages |