diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eceb677288..da516c7d5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,13 +40,13 @@ https://github.com/dotnet/aspnetcore eb67ecc1e0977e12fc2ca2c165c274d1ba6f7b4d - + https://github.com/dotnet/runtime - 367e0a8a23e444a94c029fcb72dcb4ac66bd6717 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 367e0a8a23e444a94c029fcb72dcb4ac66bd6717 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 diff --git a/eng/Versions.props b/eng/Versions.props index fcbbf79566..70a5d0e686 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,8 +16,8 @@ - 10.0.0-preview.4.25206.1 - 10.0.0-preview.4.25206.1 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 10.0.0-preview.4.25206.1 10.0.0-preview.4.25206.1 diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 7fe2f9f26b..885c235399 100644 --- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -200,7 +200,7 @@ diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs index b852b0b77f..4d92aff541 100644 --- a/src/SOS/SOS.UnitTests/SOSRunner.cs +++ b/src/SOS/SOS.UnitTests/SOSRunner.cs @@ -993,7 +993,7 @@ public async Task LoadSosExtension() if (_config.PublishSingleFile) { string appRootDir = ReplaceVariables(_variables, "%DEBUG_ROOT%"); - commands.Add($"!SetSymbolServer -ms -directory {appRootDir}"); + commands.Add($"!SetSymbolServer -ms -timeout 10 -directory {appRootDir}"); } if (!string.IsNullOrEmpty(setSymbolServer)) { @@ -1027,7 +1027,7 @@ public async Task LoadSosExtension() if (_config.PublishSingleFile) { string appRootDir = ReplaceVariables(_variables, "%DEBUG_ROOT%"); - commands.Add($"setsymbolserver -ms -directory {appRootDir}"); + commands.Add($"setsymbolserver -ms -timeout 10 -directory {appRootDir}"); } if (!string.IsNullOrEmpty(setSymbolServer)) { diff --git a/src/SOS/SOS.UnitTests/Scripts/StackTests.script b/src/SOS/SOS.UnitTests/Scripts/StackTests.script index 002a019e0c..485774da01 100644 --- a/src/SOS/SOS.UnitTests/Scripts/StackTests.script +++ b/src/SOS/SOS.UnitTests/Scripts/StackTests.script @@ -26,7 +26,7 @@ VERIFY:.*\s+\s+\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[( ENDIF:64BIT !IFDEF:WINDOWS -SOSCOMMAND:SetSymbolServer -ms -loadsymbols +SOSCOMMAND:SetSymbolServer -ms -timeout 10 -loadsymbols ENDIF:WINDOWS !IFDEF:DOTNETDUMP diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs index 3cac7cf9c9..973e2d5a8c 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs @@ -155,7 +155,7 @@ public async Task TestDuplicateNameMetrics(TestConfiguration config) { throw new SkipTestException("MetricsEventSource only supports instrument IDs starting in .NET 9.0."); } - if (OS.Kind == OSKind.OSX) + if (OS.Kind == OSKind.OSX || OS.Kind == OSKind.Windows) { throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/5375"); }