diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7aef7ebb931..fb2bcb76074 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props 1.0.0-prerelease.25467.1 1.0.0-prerelease.25467.1 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 - 5.0.0-2.26454.15 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 + 5.0.0-2.26459.2 9.0.0 9.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 600588d3283..f7a7bad9470 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,37 +42,37 @@ https://github.com/dotnet/runtime 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 - + https://github.com/dotnet/roslyn - 6773d8c49c142c794fefb104d4282f8560d7b93f + 0ea4de6ed5bc350a1ce1479344105fdd2c75ce93 https://github.com/dotnet/runtime diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs index b13739fa603..f198c1a24c3 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs @@ -65,7 +65,14 @@ module TryCatch = let result = CompilerAssert.ExecuteAndReturnResult (dllFile, isFsx=false, deps = s.Dependencies, newProcess=true) printfn "%A" result - Assert.True(result.StdErr.Contains "stack overflow" || result.StdErr.Contains "StackOverflow", result.StdErr) + Assert.True( + result.StdErr.Contains "stack overflow" + || result.StdErr.Contains "StackOverflow" + // On macOS, a stack overflow can cause SIGSEGV (128 + 11) without a runtime diagnostic. + || (TestFramework.getOperatingSystem () = "osx" + && result.Outcome = ExitCode 139 + && result.StdErr = ""), + sprintf "%A" result) | _ -> failwith (sprintf "%A" compilationResult)