From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 04:05:54 +0000 (-0700) Subject: [main] Update dependencies from dotnet/runtime (#4743) X-Git-Tag: accepted/tizen/unified/20241231.014852~39^2^2~151 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcc03c923717fa9cbd2ddc23a05e5c99369368ce;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git [main] Update dependencies from dotnet/runtime (#4743) 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**: 20240709.11 - **Date Produced**: July 10, 2024 9:37:07 AM UTC - **Commit**: c52fd37cc835a13bcfa9a64fdfe7520809a75345 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0-preview.6.24307.2 to 9.0.0-preview.7.24359.11][25] - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: [from 9.0.0-preview.6.24307.2 to 9.0.0-preview.7.24359.11][25] [25]: https://github.com/dotnet/runtime/compare/8fac5af2b1...c52fd37cc8 [DependencyUpdate]: <> (End) [marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Mike McLaughlin --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54ef4cce7..ad0dbd099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,13 +40,13 @@ https://github.com/dotnet/aspnetcore c52c28458e86029555bf1a88e94b64e7f37ef6d3 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + c52fd37cc835a13bcfa9a64fdfe7520809a75345 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + c52fd37cc835a13bcfa9a64fdfe7520809a75345 diff --git a/eng/Versions.props b/eng/Versions.props index 44de627d7..1232455b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,8 +16,8 @@ - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.7.24359.11 + 9.0.0-preview.7.24359.11 9.0.0-preview.7.24359.10 9.0.0-preview.7.24359.10 diff --git a/src/SOS/Strike/strike.cpp b/src/SOS/Strike/strike.cpp index 8c3c5eba8..a27c3d57d 100644 --- a/src/SOS/Strike/strike.cpp +++ b/src/SOS/Strike/strike.cpp @@ -2774,7 +2774,15 @@ HRESULT FormatException(CLRDATA_ADDRESS taObj, BOOL bLineNumbers = FALSE) MOVE (stackTraceSize, dataPtr); DWORD cbStackSize = static_cast(stackTraceSize * sizeof(StackTraceElement)); - dataPtr += sizeof(size_t) + sizeof(size_t); // skip the array header, then goes the data + + if (IsRuntimeVersionAtLeast(9)) + { + dataPtr += sizeof(uint32_t) + sizeof(uint32_t) + sizeof(DWORD_PTR); // skip the 9.0 array header + } + else + { + dataPtr += sizeof(size_t) + sizeof(DWORD_PTR); // skip the array header, then goes the data + } if (stackTraceSize == 0) { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs index b55ed5a64..def5d754a 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs @@ -321,7 +321,7 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests /// Tests that the trigger condition can be detected on a live application /// using the EventPipeTriggerPipeline. /// - [SkippableTheory, MemberData(nameof(Configurations))] + [SkippableTheory(Skip = "https://github.com/dotnet/diagnostics/issues/4782"), MemberData(nameof(Configurations))] public async Task EventCounterTriggerWithEventPipePipelineTest(TestConfiguration config) { if (config.RuntimeFrameworkVersionMajor < 6) diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs index c449efc5d..c42910dbb 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs @@ -169,7 +169,7 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests /// Test that log events are collected for the categories and levels specified by the application /// and for the categories and levels specified in the filter specs. /// - [SkippableTheory, MemberData(nameof(Configurations))] + [SkippableTheory(Skip = "https://github.com/dotnet/diagnostics/issues/4718"), MemberData(nameof(Configurations))] public async Task TestLogsUseAppFiltersAndFilterSpecs(TestConfiguration config) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs index f79849d23..3acc97be3 100644 --- a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs +++ b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs @@ -5,13 +5,11 @@ using System; using System.Collections.Generic; using System.Diagnostics.Tracing; using System.IO; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Diagnostics.TestHelpers; using Microsoft.Diagnostics.Tracing; using Microsoft.Diagnostics.Tracing.Etlx; -using Microsoft.Diagnostics.Tracing.Session; using Xunit; using Xunit.Abstractions; using Xunit.Extensions; @@ -117,7 +115,7 @@ namespace Microsoft.Diagnostics.NETCore.Client streamTask.Wait(10000); runner.WriteLine("Done waiting for stream Task"); - Assert.True(evntCnt > 0); + Assert.True(Volatile.Read(ref evntCnt) > 0); } } @@ -175,7 +173,7 @@ namespace Microsoft.Diagnostics.NETCore.Client runner.Stop(); } - [SkippableTheory, MemberData(nameof(Configurations))] + [SkippableTheory(Skip = "https://github.com/dotnet/diagnostics/issues/4717"), MemberData(nameof(Configurations))] public async Task StartEventPipeSessionWithoutStackwalkTestAsync(TestConfiguration testConfig) { if (testConfig.RuntimeFrameworkVersionMajor < 9)