diff options
author | Vsevolod Kukol <sevoku@microsoft.com> | 2020-01-09 14:41:13 +0300 |
---|---|---|
committer | Vsevolod Kukol <sevoku@microsoft.com> | 2020-01-09 14:41:13 +0300 |
commit | 866baa2a7ebd550c42e9aa4c4e4e22eaf9932ba2 (patch) | |
tree | c47065ab969e4733d4bc2f0e410a437b44b85051 /main | |
parent | e80f6be8e05ca47c4df2a47deb885af5be3df8cd (diff) | |
parent | 4c6723413e884e024466fc93ff10e938bca7f721 (diff) |
Merge remote-tracking branch 'origin/release-8.4' into release-8.4-a11y
Diffstat (limited to 'main')
5 files changed, 4 insertions, 9 deletions
diff --git a/main/build/MacOSX/BinaryCompatBaseline.txt b/main/build/MacOSX/BinaryCompatBaseline.txt index d302e2f571..52ffdd03cc 100755 --- a/main/build/MacOSX/BinaryCompatBaseline.txt +++ b/main/build/MacOSX/BinaryCompatBaseline.txt @@ -10,12 +10,10 @@ Could not load the file 'Microsoft.Developer.IdentityService.Client, Version=1.0 Could not load the file 'Microsoft.ServiceHub.Client, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. Could not load the file 'Microsoft.TestPlatform.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. Could not load the file 'MonoTouch.Hosting, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5caa9e03e69a5abd'. -Could not load the file 'System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. Could not load the file 'System.Runtime.Loader, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. Could not load the file 'System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'. Could not load the file 'Xamarin.Ide.Identity, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'. Could not load the file 'Xamarin.MacDev.Ide, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'. -In assembly 'Google.Apis.Core, Version=1.9.0.26010, Culture=neutral, PublicKeyToken=null': unable to resolve reference to 'System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' In assembly 'Microsoft.CodeAnalysis.Scripting, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35': unable to resolve reference to 'System.Runtime.Loader, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' In assembly 'Microsoft.CodeAnalysis.TypeScript.EditorFeatures, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': unable to resolve reference to 'Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' In assembly 'Microsoft.VisualStudio.TestPlatform.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': unable to resolve reference to 'Microsoft.TestPlatform.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' diff --git a/main/external/debugger-libs b/main/external/debugger-libs -Subproject 3f85901c8044a8547f5ec6beccfc24acd1cd697 +Subproject 71f0a9f274e7dd87b8e6eb3cd59040c2a4c3c57 diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index e02d587dce..0824931d24 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -1140,7 +1140,8 @@ namespace MonoDevelop.MacIntegration bool HasAnyDockWindowFocused () { foreach (var window in Gtk.Window.ListToplevels ()) { - if (!window.HasToplevelFocus) { + // Gtk.Window.HasToplevelFocus may return false for a window that embeds a Cocoa view + if (!window.HasToplevelFocus && GtkQuartz.GetWindow (window) != NSApplication.SharedApplication.KeyWindow) { continue; } if (window is Components.Docking.DockFloatingWindow floatingWindow) { diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs index 8ed28eb825..cac84828a8 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs @@ -74,7 +74,6 @@ namespace MonoDevelop.AspNetCore.Scaffolding }; if(comboField.PlaceholderText != null) comboBoxEntry.TextEntry.PlaceholderText = comboField.PlaceholderText; - comboBoxEntry.Items.Add (""); comboBox = comboBoxEntry; } else { comboBox = new ComboBox (); @@ -91,9 +90,6 @@ namespace MonoDevelop.AspNetCore.Scaffolding foreach (var option in options) { comboBox.Items.Add (option); } - comboField.SelectedValue = options.FirstOrDefault (); - if (comboBox.Items.Count > 0) - comboBox.SelectedIndex = 0; }); }); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.FileNesting/NestingRule.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.FileNesting/NestingRule.cs index c3c633cb5b..d7f29dc253 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.FileNesting/NestingRule.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.FileNesting/NestingRule.cs @@ -63,9 +63,9 @@ namespace MonoDevelop.Ide.Projects.FileNesting ProjectFile CheckParentForFile (ProjectFile inputFile, FilePath parentFile, FilePath inDirectory) { - if (inputFile.FilePath != parentFile && !parentFile.IsDirectory && inDirectory == parentFile.ParentDirectory) { + if (inputFile.FilePath != parentFile && inDirectory == parentFile.ParentDirectory) { var parent = inputFile.Project.Files.GetFile (parentFile); - if (parent != null) { + if (parent != null && parent.Subtype != Subtype.Directory) { Debug.WriteLine ($"Applied rule for nesting {inputFile} under {parentFile}"); return parent; } |