Skip to content

[main] Update dependencies from dotnet/runtime #5414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2025
Merged

[main] Update dependencies from dotnet/runtime #5414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c07013d
Update dependencies from https://github.com/dotnet/runtime build 2025…
dotnet-maestro[bot] Apr 8, 2025
477994f
Skip TestDuplicateNameMetrics test on Windows. Increase symbol server…
Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>eb67ecc1e0977e12fc2ca2c165c274d1ba6f7b4d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25206.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25207.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Sha>9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25206.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25207.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Sha>9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.620402">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25206.1</VSRedistCommonNetCoreSharedFrameworkx64100Version>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25206.1</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25207.7</VSRedistCommonNetCoreSharedFrameworkx64100Version>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25207.7</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-preview.4.25206.1</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>10.0.0-preview.4.25206.1</MicrosoftAspNetCoreAppRefVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
</Option>
<Option>
<TestName>SOS.DualRuntimes</TestName>
<SetSymbolServer>-ms</SetSymbolServer>
<SetSymbolServer>-ms -timeout 10</SetSymbolServer>
<!-- The assembly path, class and function name of the desktop test code to load/run -->
<DesktopTestParameters>$(RootBinDir)\bin\SymbolTestDll\$(TargetConfiguration)\$(DesktopFramework)\SymbolTestDll.dll SymbolTestDll.TestClass ThrowException</DesktopTestParameters>
</Option>
Expand Down
4 changes: 2 additions & 2 deletions src/SOS/SOS.UnitTests/SOSRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion src/SOS/SOS.UnitTests/Scripts/StackTests.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(
ENDIF:64BIT

!IFDEF:WINDOWS
SOSCOMMAND:SetSymbolServer -ms -loadsymbols
SOSCOMMAND:SetSymbolServer -ms -timeout 10 -loadsymbols
ENDIF:WINDOWS

!IFDEF:DOTNETDUMP
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down