diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 425a1578c7..05e22712d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,13 +40,13 @@ https://github.com/dotnet/aspnetcore 0cdea60e07a16bd31a5b41c5d4eac3ebeff9acd8 - + https://github.com/dotnet/runtime - 7bc07c2433edf8ea9ef2c62505c13bba182c9a7f + f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/runtime - 7bc07c2433edf8ea9ef2c62505c13bba182c9a7f + f52d8c59bb49360eb2cbeeb863c5856ebd62adda diff --git a/eng/Versions.props b/eng/Versions.props index 3888ea880a..9aef1589f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ 1.0.340801 - 7.0.0-rc.1.22410.1 - 7.0.0-rc.1.22410.1 + 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22411.12 7.0.0-rc.1.22410.1 7.0.0-rc.1.22410.1 diff --git a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script b/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script index 3cf92dd763..cbef0dbcbf 100644 --- a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script +++ b/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script @@ -202,13 +202,13 @@ ENDIF:NETCORE_OR_DOTNETDUMP # Verify DumpStack works SOSCOMMAND:DumpStack -VERIFY:.*OS Thread Id:\s+0x\s+.* +VERIFY:.*OS Thread Id:\s+0x.*\s+.* VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+ VERIFY:(.*\s+\s+\s+\(MethodDesc\s+\s+(\+\s*0x\s+)?SymbolTestApp\.Program\.Foo4\(System\.String\)\),\s+calling.*\s+)|(.*\s+\s+\s+\(MethodDesc\s+\s+(\+\s*0x\s+)?SymbolTestApp\.Program\.Foo2\(Int32, System\.String\)\),\s+calling.*\s+) # Verify DumpStack -EE works SOSCOMMAND:DumpStack -EE -VERIFY:.*OS Thread Id:\s+0x\s+.* +VERIFY:.*OS Thread Id:\s+0x.*\s+.* VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+ VERIFY:(.*\s+\s+\s+\(MethodDesc\s+\s+(\+\s*0x\s+)?SymbolTestApp\.Program\.Foo4\(System\.String\)\)\s+)|(.*\s+\s+\s+\(MethodDesc\s+\s+(\+\s*0x\s+)?SymbolTestApp\.Program\.Foo2\(Int32, System\.String\)\)\s+) diff --git a/src/SOS/SOS.UnitTests/Scripts/StackTests.script b/src/SOS/SOS.UnitTests/Scripts/StackTests.script index d140295527..d73d25805c 100644 --- a/src/SOS/SOS.UnitTests/Scripts/StackTests.script +++ b/src/SOS/SOS.UnitTests/Scripts/StackTests.script @@ -156,13 +156,13 @@ VERIFY:.*\s+\s+\s+System\.String.* # 9) Verify DumpStack works SOSCOMMAND:DumpStack -VERIFY:.*OS Thread Id:\s+0x\s+.* +VERIFY:.*OS Thread Id:\s+0x.*\s+.* VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+ VERIFY:.*\s+\s+\s+\(MethodDesc\s+\s+\+\s*0x\s+NestedExceptionTest\.Program\.Main\(System\.String\[\]\)\),\s+calling.* # 10) Verify DumpStack -EE works SOSCOMMAND:DumpStack -EE -VERIFY:.*OS Thread Id:\s+0x\s+.* +VERIFY:.*OS Thread Id:\s+0x.*\s+.* VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+ VERIFY:.*\s+\s+\s+\(MethodDesc\s+\s+\+\s*0x\s+NestedExceptionTest\.Program\.Main\(System\.String\[\]\)\)\s+