Skip to content

[main] Update dependencies from dotnet/runtime #2498

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
mikem8361 merged 2 commits into from
Aug 11, 2021
Merged

[main] Update dependencies from dotnet/runtime #2498

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
006d228
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Aug 11, 2021
d24f0f5
Fix SOS test failures with new runtime
Aug 11, 2021
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>3535cfb61dd955a7fa6c31bdf72a3eba5353f1ce</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21406.5">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21411.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58efa4b79751a2dad08d9bf7ca67930f8160afe3</Sha>
<Sha>c0662e8129beaf93b8050d39a863cc6d16a0308c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21406.5">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21411.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58efa4b79751a2dad08d9bf7ca67930f8160afe3</Sha>
<Sha>c0662e8129beaf93b8050d39a863cc6d16a0308c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
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 @@ -17,8 +17,8 @@
<MicrosoftNETCoreApp50Version>5.0.6</MicrosoftNETCoreApp50Version>
<MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21406.5</VSRedistCommonNetCoreSharedFrameworkx6460Version>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21406.5</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21411.2</VSRedistCommonNetCoreSharedFrameworkx6460Version>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21411.2</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>6.0.0-rc.1.21410.1</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>6.0.0-rc.1.21410.1</MicrosoftAspNetCoreAppRefVersion>
Expand Down
8 changes: 8 additions & 0 deletions src/SOS/SOS.UnitTests/SOSRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,6 +1192,14 @@ private HashSet<string> GetEnabledDefines()
{
defines.Add("MAJOR_RUNTIME_VERSION_GE_5");
}
if (major >= 6)
{
defines.Add("MAJOR_RUNTIME_VERSION_GE_6");
}
if (major >= 7)
{
defines.Add("MAJOR_RUNTIME_VERSION_GE_7");
}
}
catch (SkipTestException)
{
Expand Down
6 changes: 4 additions & 2 deletions src/SOS/SOS.UnitTests/Scripts/OtherCommands.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ ENDIF:DESKTOP
SOSCOMMAND:bpmd SymbolTestApp.dll SymbolTestApp.Program.Foo4
ENDIF:DESKTOP

IFDEF:PROJECTK
!IFDEF:MAJOR_RUNTIME_VERSION_GE_6
!IFDEF:DESKTOP
CONTINUE
SOSCOMMAND:ClrStack
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 16\]\s*
ENDIF:PROJECTK
ENDIF:DESKTOP
ENDIF:MAJOR_RUNTIME_VERSION_GE_6

CONTINUE
SOSCOMMAND:ClrStack
Expand Down
2 changes: 2 additions & 0 deletions src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ ENDIF:DESKTOP
SOSCOMMAND:bpmd SymbolTestApp.dll SymbolTestApp.Program.Foo4
ENDIF:DESKTOP

!IFDEF:MAJOR_RUNTIME_VERSION_GE_6
!IFDEF:DESKTOP
CONTINUE
SOSCOMMAND:ClrStack
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 16\]\s*
ENDIF:DESKTOP
ENDIF:MAJOR_RUNTIME_VERSION_GE_6

CONTINUE
SOSCOMMAND:ClrStack
Expand Down