diff options
| author | nosami <jasonimison@gmail.com> | 2018-10-02 12:40:27 +0300 |
|---|---|---|
| committer | nosami <jasonimison@gmail.com> | 2018-10-02 13:36:51 +0300 |
| commit | 45cc4107f30bb9dcbfa66b5bdd32f7b3a71b6150 (patch) | |
| tree | 49605817feeb4d49f768cb23b63c48b078068954 /main/external/fsharpbinding | |
| parent | 3c4738cb52f3d4c13707d269c214a4e8fedcb684 (diff) | |
Fix NRE when getting ConfigurationSelector
fixes VSTS #694766
Diffstat (limited to 'main/external/fsharpbinding')
| -rw-r--r-- | main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpPathExtension.fs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpPathExtension.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpPathExtension.fs index feb1e690da..8cb38c10ee 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpPathExtension.fs +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpPathExtension.fs @@ -132,7 +132,7 @@ type FSharpPathExtension() as x = match x.DocumentContext.Project with | null -> () | project when project.ParentSolution = IdeApp.ProjectOperations.CurrentSelectedSolution -> - match project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration) with + match project.ParentSolution.GetConfiguration (CompilerArguments.Project.getCurrentConfigurationOrDefault project) with | null -> () | conf when not (conf.BuildEnabledForItem (project)) -> resetOwnerProject () | _ -> () @@ -149,7 +149,7 @@ type FSharpPathExtension() as x = let sameParentSlnAndBuilt = ownerProjects |> Seq.filter (fun p -> let solutionMatch = p.ParentSolution = solution - let config = p.ParentSolution.GetConfiguration(IdeApp.Workspace.ActiveConfiguration) + let config = p.ParentSolution.GetConfiguration(CompilerArguments.Project.getCurrentConfigurationOrDefault p) let buildEnabled = config.BuildEnabledForItem(p) solutionMatch && buildEnabled && p.LanguageName = "F#") |