diff --git a/global.json b/global.json index d3eb757362..e6db33140a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "allowPrerelease": true, "paths": [ ".dotnet", @@ -9,7 +9,7 @@ "errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh." }, "tools": { - "dotnet": "10.0.100-rc.2.25502.107", + "dotnet": "10.0.100", "vs": { "version": "18.0", "components": [ diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs index bee85322a2..2cd2dcc8bc 100644 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs +++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs @@ -67,13 +67,16 @@ type DependencyManagerInteractiveTests() = let errors = script.Eval(code) |> getErrors Assert.Contains(message, errors |> Array.map(fun e -> e.Message)) *) - static member SdkDirOverrideTestData = [| - [| None |] - [| Path.Combine(__SOURCE_DIRECTORY__, "..", "..", ".dotnet", "sdk") - |> Directory.GetDirectories - |> Seq.head - |> Some |] - |] + static member SdkDirOverrideTestData = + [| + yield [| None |] + let dotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT") + if not (isNull dotnetRoot) then + yield [| Path.Combine(dotnetRoot, "sdk") + |> Directory.GetDirectories + |> Seq.head + |> Some |] + |] [] []