diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-08-22 23:03:06 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-08-22 23:03:06 +0400 |
| commit | d6d7b51e452f8c6240491e767e15de1dda7289c4 (patch) | |
| tree | a06179b9feb3b145428b80b41fed5f4248b4d95e /main/src | |
| parent | 7971509266ad8f517090601b05dcc1db5b224ff9 (diff) | |
[Core] Fix only scanning global framework directories once
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoFrameworkBackend.cs | 2 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoFrameworkBackend.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoFrameworkBackend.cs index 4028ca1a8e..00eb9e61e1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoFrameworkBackend.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoFrameworkBackend.cs @@ -39,7 +39,7 @@ namespace MonoDevelop.Core.Assemblies if (ref_assemblies_folder != null) return ref_assemblies_folder; var fxDir = framework.Id.GetAssemblyDirectoryName (); - foreach (var rootDir in ((MonoTargetRuntime)runtime).GetReferenceFrameworkDirectories (true)) { + foreach (var rootDir in ((MonoTargetRuntime)runtime).GetReferenceFrameworkDirectories ()) { var dir = rootDir.Combine (fxDir); var frameworkList = dir.Combine ("RedistList", "FrameworkList.xml"); if (!File.Exists (frameworkList)) diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs index bccde941f6..26f9639050 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs @@ -114,7 +114,7 @@ namespace MonoDevelop.Core.Assemblies return GetReferenceFrameworkDirectories (IsInitialized || IsRunning); } - internal IEnumerable<FilePath> GetReferenceFrameworkDirectories (bool includeMacGlobalDir) + IEnumerable<FilePath> GetReferenceFrameworkDirectories (bool includeGlobalDirectories) { //duplicate xbuild's framework folders path logic //see xbuild man page @@ -124,7 +124,7 @@ namespace MonoDevelop.Core.Assemblies yield return (FilePath) dir; } - if (Platform.IsMac && true) { + if (includeGlobalDirectories && Platform.IsMac) { yield return "/Library/Frameworks/Mono.framework/External/xbuild-frameworks"; } |