Skip to content

Commit 683a0e7

Browse files
michael-hawkermichael-hawker
authored
Merge pull request #4310 from Nirmal4G/hotfix/design-tools
Fix Missing Resources Exception leading to VS Designer crash
2 parents 83bcf26 + c5d4a5b commit 683a0e7

File tree

66 files changed

+85
-940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+85
-940
lines changed

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
119
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
87
using Microsoft.VisualStudio.DesignTools.Extensibility;
98
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
109

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
87
using Microsoft.VisualStudio.DesignTools.Extensibility;
98
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
109
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.ComponentModel;
6+
67
using Microsoft.VisualStudio.DesignTools.Extensibility;
78
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
89
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
@@ -27,8 +28,8 @@ public RadialProgressBarMetadata()
2728
b =>
2829
{
2930
b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults)));
30-
b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Properties.Resources.CategoryAppearance));
31-
b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Properties.Resources.CategoryBrush));
31+
b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Resources.CategoryAppearance));
32+
b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Resources.CategoryBrush));
3233
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
3334
}
3435
);

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

0 commit comments

Comments
 (0)