Skip to content

Commit 5434a62

Browse files
dotnet-maestro[bot]wiktorkjander-msft
authored
[main] Update dependencies from dotnet/diagnostics (#7995)
* Update dependencies from https://github.com/dotnet/diagnostics build 20250307.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25157.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250308.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25158.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250309.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25159.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250311.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25161.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250312.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25162.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250313.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25163.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20250314.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25164.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250316.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25166.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250317.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25167.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250318.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25168.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250319.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25169.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250320.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25170.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250323.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25155.1 -> To Version 9.0.0-preview.25173.1 * Adjust tests to use DiagnosticsClient.ApplyStartupHookAsync directly --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Wiktor Kopec <[email protected]> Co-authored-by: Justin Anderson <[email protected]>
1 parent 8305b6e commit 5434a62

File tree

3 files changed

+12
-25
lines changed

3 files changed

+12
-25
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
55
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25173.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
9+
<Sha>e2f850daa95eea9d675ba0c6d793fd41c4b76f7a</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25155.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25173.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
13+
<Sha>e2f850daa95eea9d675ba0c6d793fd41c4b76f7a</Sha>
1414
</Dependency>
1515
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -42,9 +42,9 @@
4242
<Uri>https://github.com/dotnet/arcade</Uri>
4343
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.617301">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
47+
<Sha>e2f850daa95eea9d675ba0c6d793fd41c4b76f7a</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<!-- dotnet/command-line-api references -->
5858
<SystemCommandLineVersion>2.0.0-beta5.25210.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25173.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25173.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
@@ -67,7 +67,7 @@
6767
<!-- dotnet/sdk references -->
6868
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.200-rtm.25073.13</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
6969
<!-- dotnet/symstore references -->
70-
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.617301</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
using System;
99
using System.Collections.Generic;
1010
using System.Linq;
11-
using System.Reflection;
1211
using System.Threading;
1312
using System.Threading.Tasks;
14-
using Xunit;
1513
using Xunit.Abstractions;
1614

1715
namespace Microsoft.Diagnostics.Monitoring.TestCommon
@@ -80,7 +78,9 @@ public virtual async Task OnBeforeResumeAsync(IEndpointInfo endpointInfo, Cancel
8078
{
8179
if (endpointInfo.RuntimeVersion.Major >= 8 && !string.IsNullOrEmpty(_startupHookPath))
8280
{
83-
await ApplyStartupHookAsync(new DiagnosticsClient(endpointInfo.ProcessId), _startupHookPath, token);
81+
DiagnosticsClient client = new(endpointInfo.ProcessId);
82+
83+
await client.ApplyStartupHookAsync(_startupHookPath, token);
8484
}
8585
}
8686

@@ -106,19 +106,6 @@ public Task OnRemovedEndpointInfoAsync(IEndpointInfo info, CancellationToken tok
106106
token);
107107
}
108108

109-
private static Task ApplyStartupHookAsync(DiagnosticsClient client, string path, CancellationToken token)
110-
{
111-
// DiagnosticsClient.ApplyStartupHookAsync currently is not public
112-
MethodBase applyStartupHookAsync =
113-
typeof(DiagnosticsClient).GetMethod(
114-
"ApplyStartupHookAsync",
115-
BindingFlags.Instance | BindingFlags.NonPublic);
116-
117-
Assert.NotNull(applyStartupHookAsync);
118-
119-
return (Task)applyStartupHookAsync.Invoke(client, new object[] { path, token });
120-
}
121-
122109
private static async Task<IEndpointInfo> WaitForCompletionAsync(string operation, SemaphoreSlim semaphore, List<CompletionEntry> entries, ITestOutputHelper outputHelper, AppRunner runner, TimeSpan timeout)
123110
{
124111
CompletionEntry entry = new(runner);

0 commit comments

Comments
 (0)