Skip to content

Commit c8ac017

Browse files
authored
Update .NET SDK version in global.json (#19149)
1 parent a61cda6 commit c8ac017

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.2.25502.107",
3+
"version": "10.0.100",
44
"allowPrerelease": true,
55
"paths": [
66
".dotnet",
@@ -9,7 +9,7 @@
99
"errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh."
1010
},
1111
"tools": {
12-
"dotnet": "10.0.100-rc.2.25502.107",
12+
"dotnet": "10.0.100",
1313
"vs": {
1414
"version": "18.0",
1515
"components": [

tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,16 @@ type DependencyManagerInteractiveTests() =
6767
let errors = script.Eval(code) |> getErrors
6868
Assert.Contains(message, errors |> Array.map(fun e -> e.Message))
6969
*)
70-
static member SdkDirOverrideTestData = [|
71-
[| None |]
72-
[| Path.Combine(__SOURCE_DIRECTORY__, "..", "..", ".dotnet", "sdk")
73-
|> Directory.GetDirectories
74-
|> Seq.head
75-
|> Some |]
76-
|]
70+
static member SdkDirOverrideTestData =
71+
[|
72+
yield [| None |]
73+
let dotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT")
74+
if not (isNull dotnetRoot) then
75+
yield [| Path.Combine(dotnetRoot, "sdk")
76+
|> Directory.GetDirectories
77+
|> Seq.head
78+
|> Some |]
79+
|]
7780

7881
[<Theory>]
7982
[<MemberData(nameof DependencyManagerInteractiveTests.SdkDirOverrideTestData)>]

0 commit comments

Comments
 (0)