Skip to content
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

Jump to bottom

[main] Update dependencies from dotnet/runtime #3279

Merged
merged 3 commits into from
Aug 12, 2022
Merged

[main] Update dependencies from dotnet/runtime #3279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d90464
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 11, 2022
fb3ff9c
Fix failing DumpStack tests
mikem8361 Aug 11, 2022
045799b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 12, 2022
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>0cdea60e07a16bd31a5b41c5d4eac3ebeff9acd8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22410.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22411.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7bc07c2433edf8ea9ef2c62505c13bba182c9a7f</Sha>
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22410.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7bc07c2433edf8ea9ef2c62505c13bba182c9a7f</Sha>
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</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 @@ -18,8 +18,8 @@
<!-- Latest symstore version updated by darc -->
<MicrosoftSymbolStoreVersion>1.0.340801</MicrosoftSymbolStoreVersion>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rc.1.22410.1</VSRedistCommonNetCoreSharedFrameworkx6470Version>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22410.1</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rc.1.22411.12</VSRedistCommonNetCoreSharedFrameworkx6470Version>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rc.1.22410.1</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>7.0.0-rc.1.22410.1</MicrosoftAspNetCoreAppRefVersion>
Expand Down
4 changes: 2 additions & 2 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 @@ -202,13 +202,13 @@ ENDIF:NETCORE_OR_DOTNETDUMP

# Verify DumpStack works
SOSCOMMAND:DumpStack
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>.*\s+.*
VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+
VERIFY:(.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+(\+\s*0x<HEXVAL>\s+)?SymbolTestApp\.Program\.Foo4\(System\.String\)\),\s+calling.*\s+)|(.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+(\+\s*0x<HEXVAL>\s+)?SymbolTestApp\.Program\.Foo2\(Int32, System\.String\)\),\s+calling.*\s+)

# Verify DumpStack -EE works
SOSCOMMAND:DumpStack -EE
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>.*\s+.*
VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+
VERIFY:(.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+(\+\s*0x<HEXVAL>\s+)?SymbolTestApp\.Program\.Foo4\(System\.String\)\)\s+)|(.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+(\+\s*0x<HEXVAL>\s+)?SymbolTestApp\.Program\.Foo2\(Int32, System\.String\)\)\s+)

Expand Down
4 changes: 2 additions & 2 deletions src/SOS/SOS.UnitTests/Scripts/StackTests.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+System\.String.*

# 9) Verify DumpStack works
SOSCOMMAND:DumpStack
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>.*\s+.*
VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+\+\s*0x<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(System\.String\[\]\)\),\s+calling.*

# 10) Verify DumpStack -EE works
SOSCOMMAND:DumpStack -EE
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>.*\s+.*
VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+\+\s*0x<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(System\.String\[\]\)\)\s+

Expand Down