Skip to content

Commit 01ee955

Browse files
authored
remove support for --noframework from fsi (#15362)
* remove support for --noframework from fsi * fantomas
1 parent 7994fd7 commit 01ee955

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/Compiler/Driver/CompilerOptions.fs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,9 +1233,10 @@ let noFrameworkFlag isFsc tcConfigB =
12331233
"noframework",
12341234
tagNone,
12351235
OptionUnit(fun () ->
1236-
tcConfigB.implicitlyReferenceDotNetAssemblies <- false
1237-
1236+
// When the compilation is not fsi do nothing.
1237+
// It is just not a usefull option when running fsi on the coreclr or the desktop framework really.
12381238
if isFsc then
1239+
tcConfigB.implicitlyReferenceDotNetAssemblies <- false
12391240
tcConfigB.implicitlyResolveAssemblies <- false),
12401241
None,
12411242
Some(FSComp.SR.optsNoframework ())
@@ -1251,7 +1252,6 @@ let advancedFlagsFsi tcConfigB =
12511252
None,
12521253
Some(FSComp.SR.optsClearResultsCache ())
12531254
)
1254-
noFrameworkFlag false tcConfigB
12551255
]
12561256

12571257
let advancedFlagsFsc tcConfigB =
@@ -1852,7 +1852,8 @@ let deprecatedFlagsBoth tcConfigB =
18521852
)
18531853
]
18541854

1855-
let deprecatedFlagsFsi tcConfigB = deprecatedFlagsBoth tcConfigB
1855+
let deprecatedFlagsFsi tcConfigB =
1856+
[ noFrameworkFlag false tcConfigB; yield! deprecatedFlagsBoth tcConfigB ]
18561857

18571858
let deprecatedFlagsFsc tcConfigB =
18581859
deprecatedFlagsBoth tcConfigB

tests/fsharpqa/Source/CompilerOptions/fsc/dumpAllCommandLineOptions/dummy.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//<Expects status="success">section='- ADVANCED - ' ! option=utf8output kind=OptionUnit</Expects>
3131
//<Expects status="success">section='- ADVANCED - ' ! option=fullpaths kind=OptionUnit</Expects>
3232
//<Expects status="success">section='- ADVANCED - ' ! option=lib kind=OptionStringList</Expects>
33-
//<Expects status="success">section='- ADVANCED - ' ! option=noframework kind=OptionUnit</Expects>
33+
//<Expects status="success">section='NoSection ' ! option=noframework kind=OptionUnit</Expects>
3434
//<Expects status="success">section='NoSection ' ! option=typedtree kind=OptionUnit</Expects>
3535
//<Expects status="success">section='NoSection ' ! option=typedtreefile kind=OptionUnit</Expects>
3636
//<Expects status="success">section='NoSection ' ! option=typedtreestamps kind=OptionUnit</Expects>
@@ -123,6 +123,7 @@
123123
//<Expects status="notin">section='- ADVANCED - ' ! option=standalone kind=OptionUnit</Expects>
124124
//<Expects status="notin">section='- ADVANCED - ' ! option=staticlink kind=OptionString</Expects>
125125
//<Expects status="notin">section='- ADVANCED - ' ! option=pdb kind=OptionString</Expects>
126+
//<Expects status="notin">section='- ADVANCED - ' ! option=noframework kind=OptionUnit</Expects>
126127
//<Expects status="notin">section='NoSection ' ! option=generatehtml kind=OptionUnit</Expects>
127128
//<Expects status="notin">section='NoSection ' ! option=htmloutputdir kind=OptionString</Expects>
128129
//<Expects status="notin">section='NoSection ' ! option=htmlcss kind=OptionString</Expects>

tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ Usage: fsiAnyCpu <options> [script.fsx [<arguments>]]
9494
Default - mscorlib
9595
--clearResultsCache Clear the package manager results
9696
cache
97-
--noframework Do not reference the default CLI
98-
assemblies by default
9997
--exec Exit fsi after loading the files or
10098
running the .fsx script given on the
10199
command line

tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ Usage: fsiAnyCpu <options> [script.fsx [<arguments>]]
9696
Default - mscorlib
9797
--clearResultsCache Clear the package manager results
9898
cache
99-
--noframework Do not reference the default CLI
100-
assemblies by default
10199
--exec Exit fsi after loading the files or
102100
running the .fsx script given on the
103101
command line

0 commit comments

Comments
 (0)