diff options
Diffstat (limited to 'main/src/core')
4 files changed, 41 insertions, 8 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs index e347cf50ee..a3dd50f4bd 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs @@ -972,19 +972,33 @@ namespace MonoDevelop.Projects } if (addFacadeAssemblies) { - var runtime = TargetRuntime ?? MonoDevelop.Core.Runtime.SystemAssemblyService.DefaultRuntime; - var facades = runtime.FindFacadeAssembliesForPCL (TargetFramework); - foreach (var facade in facades) { - if (!File.Exists (facade)) - continue; - var ar = new AssemblyReference (facade); - if (!result.Contains (ar)) - result.Add (ar); + var facades = await ProjectExtension.OnGetFacadeAssemblies (); + if (facades != null) { + foreach (var facade in facades) { + if (!result.Contains (facade)) + result.Add (facade); + } } } return result; } + internal protected virtual Task<List<AssemblyReference>> OnGetFacadeAssemblies () + { + List<AssemblyReference> result = null; + var runtime = TargetRuntime ?? Runtime.SystemAssemblyService.DefaultRuntime; + var facades = runtime.FindFacadeAssembliesForPCL (TargetFramework); + foreach (var facade in facades) { + if (!File.Exists (facade)) + continue; + if (result == null) + result = new List<AssemblyReference> (); + var ar = new AssemblyReference (facade); + result.Add (ar); + } + return Task.FromResult (result); + } + AsyncCriticalSection referenceCacheLock = new AsyncCriticalSection (); ImmutableDictionary<string, List<AssemblyReference>> referenceCache = ImmutableDictionary<string, List<AssemblyReference>>.Empty; bool referenceCacheNeedsRefresh; @@ -2030,6 +2044,11 @@ namespace MonoDevelop.Projects return Project.OnGetReferencedAssemblyProjects (configuration); } + internal protected override Task<List<AssemblyReference>> OnGetFacadeAssemblies () + { + return Project.OnGetFacadeAssemblies (); + } + #pragma warning disable 672 // Member overrides obsolete member internal protected override ExecutionCommand OnCreateExecutionCommand (ConfigurationSelector configSel, DotNetProjectConfiguration configuration) { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs index 3737d95c64..62106c0508 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs @@ -88,6 +88,11 @@ namespace MonoDevelop.Projects return next.OnGetReferencedAssemblyProjects (configuration); } + internal protected virtual Task<List<AssemblyReference>> OnGetFacadeAssemblies () + { + return next.OnGetFacadeAssemblies (); + } + [Obsolete("User overload that takes a RunConfiguration")] internal protected virtual ExecutionCommand OnCreateExecutionCommand (ConfigurationSelector configSel, DotNetProjectConfiguration configuration) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs index b0648b130f..9d5fcdf600 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs @@ -129,6 +129,11 @@ namespace MonoDevelop.Components return new Xwt.Drawing.Color (r, g, b, hsl.Alpha); } + public static implicit operator HslColor (Xwt.Drawing.Color color) + { + return new HslColor (color.Red, color.Green, color.Blue, color.Alpha); + } + public static implicit operator HslColor (Color color) { return new HslColor (color); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs index 6d72331346..f08ae114a9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs @@ -271,6 +271,8 @@ namespace MonoDevelop.Ide.Gui public static Color SmartTagMarkerColorLight { get; internal set; } public static Color SmartTagMarkerColorDark { get; internal set; } public static Color SearchErrorForegroundColor { get; internal set; } + public static Color SearchMarkerFallbackColor { get; internal set; } + public static Color SearchMarkerSelectedFallbackColor { get; internal set; } } public static class KeyBindingsPanel @@ -431,6 +433,8 @@ namespace MonoDevelop.Ide.Gui Editor.SmartTagMarkerColorLight = Color.FromName ("#ff70fe").WithAlpha (.5); Editor.SmartTagMarkerColorDark = Color.FromName ("#ffffff").WithAlpha (.5); Editor.SearchErrorForegroundColor = ErrorForegroundColor; + Editor.SearchMarkerFallbackColor = Color.FromName ("#f3da2d"); + Editor.SearchMarkerSelectedFallbackColor = Color.FromName ("#ffaf45"); // Key Bindings Preferences |