[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] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <mikem@microsoft.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bd9b124b9106e5a2bd0b086f5938d17ac46eab5c..9dfa03c91573c0227db3a2a2c247629231435222 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -32,13 +32,13 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>fa261b952d702c6bd604728fcbdb58ac071a22b1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24222.16">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.6.24272.7">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>576f7cb8ec5aed536319bcc65ad4ec34149b5a16</Sha>
+      <Sha>49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24222.16">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.6.24272.7">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>576f7cb8ec5aed536319bcc65ad4ec34149b5a16</Sha>
+      <Sha>49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24273.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -54,21 +54,21 @@
       <Sha>0df72d85186994facaefcb4eb832b8c8a8e5ae3d</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-1.23073.4">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24271.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
+      <Sha>40e6b96cad11400acb5b8999057ac8ba748df940</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.23073.4">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-2.24271.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
+      <Sha>40e6b96cad11400acb5b8999057ac8ba748df940</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23420.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24225.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>76d99c5f3e11f0600fae074270c0d89042c360f0</Sha>
+      <Sha>8dccccec1ce3bd2fb532ec77d7e092ab9d684db7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23420.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24225.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>76d99c5f3e11f0600fae074270c0d89042c360f0</Sha>
+      <Sha>8dccccec1ce3bd2fb532ec77d7e092ab9d684db7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
index ce27a3f90cbcce00f5d84d6f0bef681cd9b35ba9..c1bb34a6b0926e5b571b22bf3be46331fbe89014 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,14 +19,16 @@
     <VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-preview.5.24273.1</VSRedistCommonNetCoreSharedFrameworkx6490Version>
     <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.5.24273.1</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-preview.4.24222.16</MicrosoftAspNetCoreAppRefInternalVersion>
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-preview.4.24222.16</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-preview.6.24272.7</MicrosoftAspNetCoreAppRefInternalVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-preview.6.24272.7</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
     <MicrosoftDotnetSdkInternalVersion>9.0.100-preview.5.24253.16</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Opt-in/out repo features -->
     <UsingToolXliff>false</UsingToolXliff>
+    <!-- Uncomment this line to use the custom version of roslyn as needed. -->
+    <!-- <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</UsingToolMicrosoftNetCompilers> -->
     <!-- CoreFX -->
     <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
     <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
@@ -56,6 +58,15 @@
     <NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.24270.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
     <!-- Roslyn and analyzers -->
+    <!-- dotnet/roslyn dependencies -->
+    <!--
+      These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
+      Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
+      they do not break the local dev experience.
+    -->
+    <MicrosoftCodeAnalysisCSharpVersion>4.11.0-2.24271.11</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisVersion>4.11.0-2.24271.11</MicrosoftCodeAnalysisVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.11.0-2.24271.11</MicrosoftNetCompilersToolsetVersion>
     <!-- Compatibility with VS 16.11/.NET SDK 5.0.4xx -->
     <MicrosoftCodeAnalysisVersion_3_11>3.11.0</MicrosoftCodeAnalysisVersion_3_11>
     <!-- Compatibility with VS 17.0/.NET SDK 6.0.1xx  -->
@@ -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.
     -->
     <MicrosoftCodeAnalysisVersion_4_4>4.4.0</MicrosoftCodeAnalysisVersion_4_4>
-    <MicrosoftCodeAnalysisVersion_LatestVS>4.4.0</MicrosoftCodeAnalysisVersion_LatestVS>
+    <MicrosoftCodeAnalysisVersion_LatestVS>4.8.0</MicrosoftCodeAnalysisVersion_LatestVS>
     <MicrosoftCodeAnalysisVersion_LatestVS Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersion_LatestVS>
     <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23420.2</MicrosoftCodeAnalysisAnalyzersVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23420.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
@@ -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.
     -->
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>$(MicrosoftCodeAnalysisVersion_LatestVS)</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
-    <!-- dotnet/roslyn dependencies -->
-    <!--
-      These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
-      Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
-      they do not break the local dev experience.
-    -->
-    <MicrosoftCodeAnalysisCSharpVersion>4.8.0-2.23422.14</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisVersion>4.8.0-2.23422.14</MicrosoftCodeAnalysisVersion>
-    <MicrosoftNetCompilersToolsetVersion>4.8.0-2.23422.14</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
-  <!-- 
+  <!--
     SOS test runtime versions
 
     Internal service release testing:
@@ -93,7 +95,7 @@
     $(DotnetRuntimeDownloadVersion) - the service release package version i.e. 2.1.17, 3.1.3-servicing.20128.1 or "default"
     $(RuntimeSourceFeed)            - the service release internal blob storage link
     $(RuntimeSourceFeedKey)         - the service release blob feed token
-     
+
   -->
   <PropertyGroup>
     <MicrosoftNETCoreApp80Version>8.0.5</MicrosoftNETCoreApp80Version>

diff --git a/global.json b/global.json
index 45f681ccdf1d2241de36f2003961008feb6c81a8..0db05bacf57679530eac952b402a85b0292ad0ac 100644 (file)
--- 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 14ca871db42340ed14a8e61bf134f1bbfd5135ce..1d56fb729f185b6c00ee55648481c0bcae730c9f 100644 (file)
--- 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<EventPipeProvider> 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 bd17a621298d2ca7dc11fd5508c8197c92919162..6d8ebd0b027b010da02c9c52aea737784c972b1b 100644 (file)
--- 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<EventPipeProvider> 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 19f89c99f0301490bd0c684efe011114187a98af..42e06143be06e3e9aedac6d6b4e00e54b4668b4b 100644 (file)
--- 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<EventPipeProvider> 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 4d8a40c6bb9aef0deed10a56e0135855a7097923..5eaf9bce4aeed21db66c1c9a0045ed224906a24f 100644 (file)
--- 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<EventPipeProvider> {
-                    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<EventPipeProvider> {
-                    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 c583e4a143fbfe3af81d19b44399289042188c05..a25f863245228cddf92f75fa0c2c932e3c9e5d30 100644 (file)
--- 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 |