Skip to content

Commit 8ae1964

Browse files
baronfelKrzysztof-Cieslak
authored andcommitted
better check for if a project is an executable (#1451)
1 parent f90c9dd commit 8ae1964

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

src/Core/Project.fs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,29 +53,18 @@ module Project =
5353

5454
let deepLevel = "FSharp.workspaceModePeekDeepLevel" |> Configuration.get 2 |> max 0
5555

56-
let isANetCoreAppProject (project : Project) =
57-
let projectContent = (node.fs.readFileSync project.Project).ToString()
58-
let netCoreTargets =
59-
[ "<TargetFramework>netcoreapp"
60-
"<Project Sdk=\"" ]
61-
62-
let findInProject (toFind : string) =
63-
projectContent.IndexOf(toFind) >= 0
64-
65-
netCoreTargets |> Seq.exists findInProject
66-
6756
let isNetCoreApp (project : Project) =
68-
let projectContent = (node.fs.readFileSync project.Project).ToString()
69-
let core = "<TargetFramework>netcoreapp"
70-
projectContent.IndexOf(core) >= 0
57+
project.Info.TargetFramework
58+
:: project.Info.TargetFrameworks
59+
|> Seq.exists (fun tfm -> tfm = "net5.0" || tfm.StartsWith "netcoreapp")
7160

7261
let isSDKProjectPath (project : string) =
7362
let projectContent = (node.fs.readFileSync project).ToString()
7463
let sdk = "<Project Sdk=\""
7564
projectContent.IndexOf(sdk) >= 0
7665

7766
let isExeProject (project : Project) =
78-
match project.Output, isANetCoreAppProject project with
67+
match project.Output, isNetCoreApp project with
7968
| _, true ->
8069
project.OutputType.ToLowerInvariant() <> "lib"
8170
| out, _ when out |> String.endWith ".exe" -> true

0 commit comments

Comments
 (0)