Merge main to feature/10.0 (#8130)

Author: jander-msft

eng/Version.Details.xml

@@ -4,13 +4,13 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>a94ba4b6c94e09433b586db219bd854e70021e5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25220.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
+      <Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25155.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25220.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
+      <Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta5.25170.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -42,9 +42,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.622001">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
+      <Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25215.12" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -57,8 +57,8 @@
     <!-- dotnet/command-line-api references -->
     <SystemCommandLineVersion>2.0.0-beta5.25170.1</SystemCommandLineVersion>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25220.1</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25220.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/roslyn-analyzers -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <!-- dotnet/runtime references -->
@@ -67,7 +67,7 @@
     <!-- dotnet/sdk references -->
     <VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.4.25216.30</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
     <!-- dotnet/symstore references -->
-    <MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
+    <MicrosoftFileFormatsVersion>1.0.622001</MicrosoftFileFormatsVersion>
   </PropertyGroup>
   <PropertyGroup Label="Runtime Versions">
     <MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

eng/dependabot/independent/Packages.props

@@ -16,7 +16,6 @@
     <!-- Third-party references -->
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="NJsonSchema" Version="$(NJsonSchemaVersion)" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleAspNetCoreVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="AWSSDK.S3" Version="$(AwsSdkS3Version)" />
     <PackageReference Include="AWSSDK.SecurityToken" Version="$(AwsSdkSecurityTokenVersion)" />

eng/dependabot/independent/Versions.props

@@ -14,7 +14,6 @@
     <!-- Third-party references -->
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <NJsonSchemaVersion>11.0.0</NJsonSchemaVersion>
-    <SwashbuckleAspNetCoreVersion>7.2.0</SwashbuckleAspNetCoreVersion>
     <AwsSdkS3Version>3.7.305.7</AwsSdkS3Version>
     <AwsSdkSecurityTokenVersion>3.7.300.33</AwsSdkSecurityTokenVersion>
 

eng/dependabot/nuget.org/Versions.props

@@ -2,6 +2,6 @@
   <!-- Import references updated by Dependabot. -->
   <PropertyGroup>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringShippedVersion>9.0.607501</MicrosoftDiagnosticsMonitoringShippedVersion>
+    <MicrosoftDiagnosticsMonitoringShippedVersion>9.0.621003</MicrosoftDiagnosticsMonitoringShippedVersion>
   </PropertyGroup>
 </Project>

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/EndpointInfoSourceCallback.cs

@@ -8,10 +8,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.Diagnostics.Monitoring.TestCommon
@@ -80,7 +78,9 @@ public virtual async Task OnBeforeResumeAsync(IEndpointInfo endpointInfo, Cancel
         {
             if (endpointInfo.RuntimeVersion.Major >= 8 && !string.IsNullOrEmpty(_startupHookPath))
             {
-                await ApplyStartupHookAsync(new DiagnosticsClient(endpointInfo.ProcessId), _startupHookPath, token);
+                DiagnosticsClient client = new(endpointInfo.ProcessId);
+
+                await client.ApplyStartupHookAsync(_startupHookPath, token);
             }
         }
 
@@ -106,19 +106,6 @@ public Task OnRemovedEndpointInfoAsync(IEndpointInfo info, CancellationToken tok
                 token);
         }
 
-        private static Task ApplyStartupHookAsync(DiagnosticsClient client, string path, CancellationToken token)
-        {
-            // DiagnosticsClient.ApplyStartupHookAsync currently is not public
-            MethodBase applyStartupHookAsync =
-                typeof(DiagnosticsClient).GetMethod(
-                    "ApplyStartupHookAsync",
-                    BindingFlags.Instance | BindingFlags.NonPublic);
-
-            Assert.NotNull(applyStartupHookAsync);
-
-            return (Task)applyStartupHookAsync.Invoke(client, new object[] { path, token });
-        }
-
         private static async Task<IEndpointInfo> WaitForCompletionAsync(string operation, SemaphoreSlim semaphore, List<CompletionEntry> entries, ITestOutputHelper outputHelper, AppRunner runner, TimeSpan timeout)
         {
             CompletionEntry entry = new(runner);