diff options
author | Vsevolod Kukol <sevoku@microsoft.com> | 2020-01-14 20:57:49 +0300 |
---|---|---|
committer | Vsevolod Kukol <sevoku@microsoft.com> | 2020-01-14 20:57:49 +0300 |
commit | db3bc7f42e9b706bb4cf60579e3638ff58560fab (patch) | |
tree | a16af4588a6e8b93d496f50d056753ac9976f421 /main | |
parent | 2f4377d10c8b5fba8d6109d6ede0ef4e86853eb4 (diff) | |
parent | b46c7304625bbe8b573bb05f0085e3fccfa1e284 (diff) |
Merge remote-tracking branch 'origin/release-8.4' into release-8.4-a11y
Diffstat (limited to 'main')
4 files changed, 16 insertions, 9 deletions
diff --git a/main/external/xwt b/main/external/xwt -Subproject a0415dd444d910c5b1b87073db1a89762481e93 +Subproject b153c95e33c515f9c0588b4007f891bb832c90e diff --git a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml index d2b66be740..026f9d2634 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml +++ b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml @@ -136,7 +136,7 @@ <Template
id="Microsoft.Worker.Empty.CSharp"
templateId="Microsoft.Worker.Empty.CSharp.3.1"
- _overrideName="Worker"
+ _overrideName="Worker Service" _overrideDescription="An empty project template for creating a worker service."
path="${DotNetCoreSdk.3.1.Templates.Web.ProjectTemplates.nupkg}"
icon="md-netcore-empty-project"
@@ -144,7 +144,7 @@ wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
supportedParameters="AspNetCoreWorker"
condition="UseNetCore31=true"
- category="netcore/app/aspnet"
+ category="netcore/app/general" defaultParameters="IncludeLaunchSettings=true" />
<Template
id="Microsoft.Web.RazorPages.CSharp"
@@ -305,7 +305,7 @@ <Template
id="Microsoft.Worker.Empty.CSharp"
templateId="Microsoft.Worker.Empty.CSharp.3.0"
- _overrideName="Worker"
+ _overrideName="Worker Service" _overrideDescription="An empty project template for creating a worker service."
path="${DotNetCoreSdk.3.0.Templates.Web.ProjectTemplates.nupkg}"
icon="md-netcore-empty-project"
@@ -313,7 +313,7 @@ wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
supportedParameters="AspNetCoreWorker"
condition="UseNetCore30=true"
- category="netcore/app/aspnet"
+ category="netcore/app/general" defaultParameters="IncludeLaunchSettings=true" />
<Template
id="Microsoft.Web.RazorPages.CSharp"
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/NativePropertyEditor/ComponentModelEditorProvider.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/NativePropertyEditor/ComponentModelEditorProvider.cs index 5a95a0b4bb..06b595bd09 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/NativePropertyEditor/ComponentModelEditorProvider.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/NativePropertyEditor/ComponentModelEditorProvider.cs @@ -96,11 +96,8 @@ namespace MonoDevelop.DesignerSupport var collection = new List<DescriptorPropertyInfo> (); foreach (object propertyProvider in providers) { - //get the current properties for this provider - var currentType = propertyProvider.GetType (); - - //we want all property descriptors for this propertyProvider type - var propertyDescriptors = System.ComponentModel.TypeDescriptor.GetProperties (currentType); + //we want all property descriptors for this propertyProvider + var propertyDescriptors = System.ComponentModel.TypeDescriptor.GetProperties (propertyProvider); foreach (System.ComponentModel.PropertyDescriptor propertyDescriptor in propertyDescriptors) { if (propertyDescriptor.IsBrowsable) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs index a9763a1510..62986247a3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs @@ -574,6 +574,7 @@ namespace MonoDevelop.Components.MainToolbar currentSolution.StartupConfigurationChanged -= HandleStartupItemChanged; currentSolution.Saved -= HandleSolutionSaved; currentSolution.EntrySaved -= HandleSolutionEntrySaved; + currentSolution.SolutionItemAdded -= HandleSolutionItemAdded; } currentSolution = e.Solution; @@ -582,6 +583,7 @@ namespace MonoDevelop.Components.MainToolbar currentSolution.StartupConfigurationChanged += HandleStartupItemChanged; currentSolution.Saved += HandleSolutionSaved; currentSolution.EntrySaved += HandleSolutionEntrySaved; + currentSolution.SolutionItemAdded += HandleSolutionItemAdded; } TrackStartupProject (); @@ -624,6 +626,14 @@ namespace MonoDevelop.Components.MainToolbar HandleSolutionSaved (sender, e); } + void HandleSolutionItemAdded (object sender, SolutionItemChangeEventArgs e) + { + // When a solution item is added due to a reload we need to ensure the configurationMergers dictionary is + // using the new project and not the old disposed project. + if (e.Reloading) + UpdateCombos (); + } + void HandleStartupItemChanged (object sender, EventArgs e) { TrackStartupProject (); |