Merge remote-tracking branch 'origin/main' into feature/10.0

Author: github-actions[bot]

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);