CommunityToolkit
/
WindowsCommunityToolkit
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix incorrect Root Namespace 

This leads to embedded resources being not found and the VS Designer crashes
This commit is contained in:
Nirmal Guru 2021-09-30 08:16:30 +05:30
Родитель dd076f3bd8
Коммит 764ce94d17
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 230F32B3E627D620
50 изменённых файлов: 64 добавлений и 106 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

1
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
Просмотреть файл

@ -4,7 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

1
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs
Просмотреть файл

@ -4,7 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

5
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
Просмотреть файл

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
@ -27,8 +28,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
b =>
{
b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults)));
b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Properties.Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Resources.CategoryBrush));
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
}
);

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

1
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs
Просмотреть файл

@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;

2
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

2
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
Просмотреть файл

@ -230,7 +230,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Automation.Peers
}
}
string name = UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
string name = UI.Controls.Resources.DataGridRowAutomationPeer_ItemType;
#if DEBUG_AUTOMATION
System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + name);
#endif

2
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
Просмотреть файл

@ -56,7 +56,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Automation.Peers
return itemType;
}
return UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
return UI.Controls.Resources.DataGridRowAutomationPeer_ItemType;
}
}
}

2
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
Просмотреть файл

@ -409,7 +409,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
_loadedRows = new List<DataGridRow>();
_lostFocusActions = new Queue<Action>();
_selectedItems = new DataGridSelectedItemsCollection(this);
_rowGroupHeaderPropertyNameAlternative = Properties.Resources.DefaultRowGroupHeaderPropertyNameAlternative;
_rowGroupHeaderPropertyNameAlternative = Controls.Resources.DefaultRowGroupHeaderPropertyNameAlternative;
_rowGroupHeaderStyles = new ObservableCollection<Style>();
_rowGroupHeaderStyles.CollectionChanged += RowGroupHeaderStyles_CollectionChanged;
_rowGroupHeaderStylesOld = new List<Style>();

4
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowGroupHeader.cs
Просмотреть файл

@ -656,7 +656,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
if (!string.IsNullOrEmpty(propertyName) && hasPropertyValue)
{
propertyName = string.Format(CultureInfo.CurrentCulture, Properties.Resources.DataGridRowGroupHeader_PropertyName, propertyName);
propertyName = string.Format(CultureInfo.CurrentCulture, Controls.Resources.DataGridRowGroupHeader_PropertyName, propertyName);
}
if (!string.IsNullOrEmpty(propertyName))
@ -674,7 +674,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
{
_itemCountElement.Text = string.Format(
CultureInfo.CurrentCulture,
this.RowGroupInfo.CollectionViewGroup.GroupItems.Count == 1 ? Properties.Resources.DataGridRowGroupHeader_ItemCountSingular : Properties.Resources.DataGridRowGroupHeader_ItemCountPlural,
this.RowGroupInfo.CollectionViewGroup.GroupItems.Count == 1 ? Controls.Resources.DataGridRowGroupHeader_ItemCountSingular : Controls.Resources.DataGridRowGroupHeader_ItemCountPlural,
this.RowGroupInfo.CollectionViewGroup.GroupItems.Count);
}
}

3
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
Просмотреть файл

@ -17,6 +17,9 @@
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
<!-- The 'ManifestResourceName' metadata changes the default manifest naming scheme -->
<ManifestResourceName>$(RootNamespace).%(Filename)</ManifestResourceName>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>

4
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls {
using System;
using System.Reflection;
@ -40,7 +40,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Resources", typeof(Resources).GetTypeInfo().Assembly);
resourceMan = temp;
}
return resourceMan;

42
Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs
Просмотреть файл

@ -28,27 +28,27 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
b =>
{
b.AddCustomAttributes(new FeatureAttribute(typeof(RadialGaugeDefaults)));
b.AddCustomAttributes(nameof(RadialGauge.Minimum), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.Maximum), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.StepSize), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.IsInteractive), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.ScaleWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.NeedleBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.Value), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.Unit), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.TrailBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.ScaleBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.TickBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.ValueStringFormat), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.TickSpacing), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.NeedleLength), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.NeedleWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.ScalePadding), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.ScaleTickWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.TickWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.TickLength), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.MinAngle), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.MaxAngle), new CategoryAttribute(Properties.Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.Minimum), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.Maximum), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.StepSize), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.IsInteractive), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.ScaleWidth), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.NeedleBrush), new CategoryAttribute(Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.Value), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.Unit), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.TrailBrush), new CategoryAttribute(Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.ScaleBrush), new CategoryAttribute(Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.TickBrush), new CategoryAttribute(Resources.CategoryBrush));
b.AddCustomAttributes(nameof(RadialGauge.ValueStringFormat), new CategoryAttribute(Resources.CategoryCommon));
b.AddCustomAttributes(nameof(RadialGauge.TickSpacing), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.NeedleLength), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.NeedleWidth), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.ScalePadding), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.ScaleTickWidth), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.TickWidth), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.TickLength), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.MinAngle), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(nameof(RadialGauge.MaxAngle), new CategoryAttribute(Resources.CategoryAppearance));
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
}
);

2
Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

4
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
Просмотреть файл

@ -2,10 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using System.ComponentModel;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
using System.ComponentModel;
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
{

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

1
Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs
Просмотреть файл

@ -4,7 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

2
Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

2
Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs
Просмотреть файл

@ -4,8 +4,6 @@
using System.ComponentModel;
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
using Microsoft.VisualStudio.DesignTools.Extensibility;
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

2
Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
</PropertyGroup>
<PropertyGroup>

4
Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
using System;
@ -39,7 +39,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

10
build/Windows.Toolkit.VisualStudio.Design.props
Просмотреть файл

@ -12,17 +12,13 @@
<EmbeddedResourceUseDependentUponConvention>True</EmbeddedResourceUseDependentUponConvention>
<ParentTargetFramework>uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision)</ParentTargetFramework>
<ParentProjectName>$(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.'))))</ParentProjectName>
<!-- Strip root namespace from strings like "Microsoft.Toolkit.Uwp.UI.Controls.Primitives" to just "Primitives" -->
<ParentProjectType>$(ParentProjectName.Remove(0, $([MSBuild]::Add($(ParentProjectName.LastIndexOf('.')), '1'))))</ParentProjectType>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\"/>
<EmbeddedResource Include="Icons\$(ParentProjectName).*.icon.png"/>
<EmbeddedResource Include="$(ParentProjectOutputPath)$(ParentProjectName).xml">
<Link>$(ParentProjectType).xml</Link>
<Visible>False</Visible>
</EmbeddedResource>
<!-- The 'LogicalName' metadata changes the default manifest naming scheme -->
<EmbeddedResource Include="Icons\$(ParentProjectName).*.icon.png" LogicalName="$(ParentProjectRootNamespace).%(Filename)%(Extension)"/>
<EmbeddedResource Include="$(ParentProjectOutputPath)$(ParentProjectName).xml" LinkBase="Properties\" LogicalName="%(Filename)%(Extension)"/>
</ItemGroup>
</Project>

4
build/Windows.Toolkit.VisualStudio.Design.targets
Просмотреть файл

@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<ParentProjectRootNamespace>$(RootNamespace.Remove($(RootNamespace.LastIndexOf('.'))))</ParentProjectRootNamespace>
<ParentProjectOutputPath>..\$(ParentProjectName)\bin\$(Configuration)\$(ParentTargetFramework)\</ParentProjectOutputPath>
<OutputPath>$(ParentProjectOutputPath)Design\</OutputPath>
</PropertyGroup>
@ -13,6 +14,9 @@
<EmbeddedResource Update="**\*.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
<!-- The 'ManifestResourceName' metadata changes the default manifest naming scheme -->
<ManifestResourceName>$(RootNamespace).%(Filename)</ManifestResourceName>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>