Skip to content

Use process dependencies for fsi #6324

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
KevinRansom merged 8 commits into from
Apr 1, 2019
Merged

Use process dependencies for fsi #6324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
23d1453
Use process dependencies for fsi
KevinRansom Mar 12, 2019
d1105b6
default references now have full path
KevinRansom Mar 12, 2019
f135df9
tweak
KevinRansom Mar 13, 2019
dd8fe3e
Desktop does not recurse dependencies
KevinRansom Mar 13, 2019
c8c2b63
Use existing resolution logic on desktop
KevinRansom Mar 13, 2019
0fc8e2d
build from source, system.private.corelib
KevinRansom Mar 13, 2019
e9c5857
ci_part4
KevinRansom Mar 14, 2019
368f54f
Deal with Dev 15.0 portable pdb symbols
KevinRansom Mar 30, 2019
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
Prev Previous commit
Next Next commit
default references now have full path
  • Loading branch information
@KevinRansom
KevinRansom committed Mar 29, 2019
commit d1105b6a907332a9ff470a552d98bdb5b230bc70
4 changes: 2 additions & 2 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3504,7 +3504,7 @@ type TcAssemblyResolutions(tcConfig: TcConfig, results: AssemblyResolution list,
let assumeDotNetFramework = primaryReference.SimpleAssemblyNameIs("mscorlib")
if tcConfig.framework then
for s in defaultReferencesForScriptsAndOutOfProjectSources assumeDotNetFramework do
yield AssemblyReference(rangeStartup, (if s.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) then s else s+".dll"), None)
yield AssemblyReference(rangeStartup, s, None)

if tcConfig.useFsiAuxLib then
let name = Path.Combine(tcConfig.fsharpBinariesDir, getFsiLibraryName + ".dll")
Expand Down Expand Up @@ -4896,7 +4896,7 @@ module private ScriptPreprocessClosure =
applyCommandLineArgs tcConfigB

match basicReferences with
| None -> (basicReferencesForScriptLoadClosure useFsiAuxLib assumeDotNetFramework) |> List.iter(fun f->tcConfigB.AddReferencedAssemblyByPath(range0, f)) // Add script references
| None -> basicReferencesForScriptLoadClosure (useFsiAuxLib assumeDotNetFramework) |> List.iter(fun f->tcConfigB.AddReferencedAssemblyByPath(range0, f)) // Add script references
| Some rs -> for m, r in rs do tcConfigB.AddReferencedAssemblyByPath(m, r)

tcConfigB.resolutionEnvironment <-
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type private ProjectSiteOfSingleFile(sourceFile) =
let assumeDotNetFramework = true
let defaultReferences =
[ for r in CompilerEnvironment.DefaultReferencesForOrphanSources(assumeDotNetFramework) do
yield sprintf "-r:%s%s" r (if r.EndsWith(".dll",StringComparison.OrdinalIgnoreCase) then "" else ".dll") ]
yield sprintf "-r:%s" r ]
(flags @ defaultReferences)
|> List.toArray
|> Array.choose (fun flag -> if flag.StartsWith("-r:") then Some flag.[3..] elif flag.StartsWith("--reference:") then Some flag.[12..] else None)
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ type private ProjectSiteOfSingleFile(sourceFile) =
let assumeDotNetFramework = true
let defaultReferences =
[ for r in CompilerEnvironment.DefaultReferencesForOrphanSources(assumeDotNetFramework) do
yield sprintf "-r:%s%s" r (if r.EndsWith(".dll",StringComparison.OrdinalIgnoreCase) then "" else ".dll") ]
yield sprintf "-r:%s" r ]
(flags @ defaultReferences)
|> List.toArray
|> Array.choose (fun flag -> if flag.StartsWith("-r:") then Some flag.[3..] elif flag.StartsWith("--reference:") then Some flag.[12..] else None)
Expand Down