Skip to content

remove support for --noframework from fsi #15362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2023
Merged

remove support for --noframework from fsi #15362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a24247
remove support for --noframework from fsi
KevinRansom Jun 9, 2023
a18d50a
fantomas
KevinRansom Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Compiler/Driver/CompilerOptions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,9 +1233,10 @@ let noFrameworkFlag isFsc tcConfigB =
"noframework",
tagNone,
OptionUnit(fun () ->
tcConfigB.implicitlyReferenceDotNetAssemblies <- false

// When the compilation is not fsi do nothing.
// It is just not a usefull option when running fsi on the coreclr or the desktop framework really.
if isFsc then
tcConfigB.implicitlyReferenceDotNetAssemblies <- false
tcConfigB.implicitlyResolveAssemblies <- false),
None,
Some(FSComp.SR.optsNoframework ())
Expand All @@ -1251,7 +1252,6 @@ let advancedFlagsFsi tcConfigB =
None,
Some(FSComp.SR.optsClearResultsCache ())
)
noFrameworkFlag false tcConfigB
]

let advancedFlagsFsc tcConfigB =
Expand Down Expand Up @@ -1852,7 +1852,8 @@ let deprecatedFlagsBoth tcConfigB =
)
]

let deprecatedFlagsFsi tcConfigB = deprecatedFlagsBoth tcConfigB
let deprecatedFlagsFsi tcConfigB =
[ noFrameworkFlag false tcConfigB; yield! deprecatedFlagsBoth tcConfigB ]

let deprecatedFlagsFsc tcConfigB =
deprecatedFlagsBoth tcConfigB
Expand Down
3 changes: 2 additions & 1 deletion tests/fsharpqa/Source/CompilerOptions/fsc/dumpAllCommandLineOptions/dummy.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
//<Expects status="success">section='- ADVANCED - ' ! option=utf8output kind=OptionUnit</Expects>
//<Expects status="success">section='- ADVANCED - ' ! option=fullpaths kind=OptionUnit</Expects>
//<Expects status="success">section='- ADVANCED - ' ! option=lib kind=OptionStringList</Expects>
//<Expects status="success">section='- ADVANCED - ' ! option=noframework kind=OptionUnit</Expects>
//<Expects status="success">section='NoSection ' ! option=noframework kind=OptionUnit</Expects>
//<Expects status="success">section='NoSection ' ! option=typedtree kind=OptionUnit</Expects>
//<Expects status="success">section='NoSection ' ! option=typedtreefile kind=OptionUnit</Expects>
//<Expects status="success">section='NoSection ' ! option=typedtreestamps kind=OptionUnit</Expects>
Expand Down Expand Up @@ -123,6 +123,7 @@
//<Expects status="notin">section='- ADVANCED - ' ! option=standalone kind=OptionUnit</Expects>
//<Expects status="notin">section='- ADVANCED - ' ! option=staticlink kind=OptionString</Expects>
//<Expects status="notin">section='- ADVANCED - ' ! option=pdb kind=OptionString</Expects>
//<Expects status="notin">section='- ADVANCED - ' ! option=noframework kind=OptionUnit</Expects>
//<Expects status="notin">section='NoSection ' ! option=generatehtml kind=OptionUnit</Expects>
//<Expects status="notin">section='NoSection ' ! option=htmloutputdir kind=OptionString</Expects>
//<Expects status="notin">section='NoSection ' ! option=htmlcss kind=OptionString</Expects>
Expand Down
2 changes: 0 additions & 2 deletions tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ Usage: fsiAnyCpu <options> [script.fsx [<arguments>]]
Default - mscorlib
--clearResultsCache Clear the package manager results
cache
--noframework Do not reference the default CLI
assemblies by default
--exec Exit fsi after loading the files or
running the .fsx script given on the
command line
Expand Down
2 changes: 0 additions & 2 deletions tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ Usage: fsiAnyCpu <options> [script.fsx [<arguments>]]
Default - mscorlib
--clearResultsCache Clear the package manager results
cache
--noframework Do not reference the default CLI
assemblies by default
--exec Exit fsi after loading the files or
running the .fsx script given on the
command line
Expand Down