From fb4af5211d12fe4c0914d686da11bcc83458a461 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:37:19 -0700 Subject: [PATCH] [main] Update dependencies from dotnet/runtime (#4845) This pull request updates the following dependencies [marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) ## From https://github.com/dotnet/runtime - **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f - **Build**: 20240810.5 - **Date Produced**: August 11, 2024 10:41:29 AM UTC - **Commit**: 7cb32e193a55a95c74fc3bd56501b951b48b700f - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0-rc.1.24409.6 to 9.0.0-rc.1.24410.5][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: [from 9.0.0-rc.1.24409.6 to 9.0.0-rc.1.24410.5][2] [2]: https://github.com/dotnet/runtime/compare/0953757c1e...7cb32e193a [DependencyUpdate]: <> (End) [marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Mike McLaughlin --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- .../EventCounterPipelineUnitTests.cs | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01ac52744..f45103fa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,13 +40,13 @@ https://github.com/dotnet/aspnetcore e31445e897e416b743f436b27cb81f3c87c56d27 - + https://github.com/dotnet/runtime - 48aa31535f0e5f318f061eb6f8ad4f25611e6133 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 48aa31535f0e5f318f061eb6f8ad4f25611e6133 + 7cb32e193a55a95c74fc3bd56501b951b48b700f diff --git a/eng/Versions.props b/eng/Versions.props index d6e7c1e44..1d461d2fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,8 +16,8 @@ - 9.0.0-rc.1.24408.13 - 9.0.0-rc.1.24408.13 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 9.0.0-rc.1.24408.9 9.0.0-rc.1.24408.9 diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs index 208d63045..355324db2 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs @@ -88,6 +88,10 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests [SkippableTheory, MemberData(nameof(Configurations))] public async Task TestCounterEventPipeline(TestConfiguration config) { + if (config.RuntimeFrameworkVersionMajor > 8) + { + throw new SkipTestException("Not supported on .NET 9.0 and greater"); + } string[] expectedCounters = new[] { "cpu-usage", "working-set" }; string expectedProvider = "System.Runtime"; -- 2.34.1