Skip to content

Commit 91d81fa

Browse files
Nirmal4GNirmal4G
committed
Remove older XAML DesignTime support
The process isolated designer is replaced by surface isolated designer from Visual Studio IDE v16.3 onwards
1 parent 8cdebc8 commit 91d81fa

File tree

62 files changed

+21
-916
lines changed

Some content is hidden

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

62 files changed

+21
-916
lines changed

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@
55
using System.ComponentModel;
66
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
77

8-
#if VS_DESIGNER_PROCESS_ISOLATION
9-
using Microsoft.Windows.Design;
10-
using Microsoft.Windows.Design.Features;
11-
using Microsoft.Windows.Design.Metadata;
12-
using Microsoft.Windows.Design.Model;
13-
#else
148
using Microsoft.VisualStudio.DesignTools.Extensibility;
159
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
1610
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
1711
using Microsoft.VisualStudio.DesignTools.Extensibility.Model;
18-
#endif
1912

2013
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
2114
{

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,6 @@
66

77
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
88
{
9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
internal static partial class ControlTypes
11-
{
12-
internal static readonly Type DataGrid = typeof(DataGrid);
13-
internal static readonly Type DataGridColumn = typeof(DataGridColumn);
14-
internal static readonly Type DataGridBoundColumn = typeof(DataGridBoundColumn);
15-
internal static readonly Type DataGridTextColumn = typeof(DataGridTextColumn);
16-
internal static readonly Type DataGridCheckBoxColumn = typeof(DataGridCheckBoxColumn);
17-
internal static readonly Type DataGridTemplateColumn = typeof(DataGridTemplateColumn);
18-
}
19-
#else
209
internal static partial class ControlTypes
2110
{
2211
internal const string DataGrid = RootNamespace + "." + nameof(DataGrid);
@@ -111,5 +100,4 @@ internal static class DataGridTemplateColumn
111100
internal const string CellEditingTemplate = nameof(CellEditingTemplate);
112101
internal const string CellTemplate = nameof(CellTemplate);
113102
}
114-
#endif
115103
}

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@
7878
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
7979
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
8080
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
81+
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
8182
<Compile Include="Controls\DataGrid.Metadata.cs" />
8283
<Compile Include="Controls\DataGrid.Typedata.cs" />
83-
<Compile Include="MetadataRegistration.cs" />
8484
<Compile Include="Properties\AssemblyInfo.cs">
8585
<SubType>Code</SubType>
8686
</Compile>

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99

1010
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1111
{
12-
#if !VS_DESIGNER_PROCESS_ISOLATION
1312
internal static partial class ControlTypes
1413
{
1514
// HACK: Don't forget to update, if the namespace changes.
1615
public const string RootNamespace = "Microsoft.Toolkit.Uwp.UI.Controls";
1716
}
18-
#endif
17+
1918
/// <summary>
2019
/// Names for ToolboxCategoryAttribute.
2120
/// </summary>

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313

1414
using Microsoft.Toolkit.Uwp.Design.Types;
1515

16-
#if VS_DESIGNER_PROCESS_ISOLATION
17-
using Microsoft.Windows.Design;
18-
using Microsoft.Windows.Design.Metadata;
19-
#else
2016
using Microsoft.VisualStudio.DesignTools.Extensibility;
2117
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
22-
#endif
2318

2419
namespace Microsoft.Toolkit.Uwp.Design.Common
2520
{
@@ -142,11 +137,7 @@ private void AddDescriptions(AttributeTableBuilder builder)
142137
}
143138

144139
var type = Type.GetType(typeName + ", " + AssemblyFullName);
145-
#if VS_DESIGNER_PROCESS_ISOLATION
146-
var typeID = type;
147-
#else
148-
var typeID = typeName;
149-
#endif
140+
150141
if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject))
151142
{
152143
string desc = ParseDescription(member);
@@ -159,11 +150,11 @@ private void AddDescriptions(AttributeTableBuilder builder)
159150
{
160151
if (IsBrowsable(type))
161152
{
162-
builder.AddCustomAttributes(typeID, new DescriptionAttribute(desc));
153+
builder.AddCustomAttributes(typeName, new DescriptionAttribute(desc));
163154
}
164155
else //Hide from intellisense
165156
{
166-
builder.AddCustomAttributes(typeID,
157+
builder.AddCustomAttributes(typeName,
167158
new BrowsableAttribute(false),
168159
new ToolboxBrowsableAttribute(false),
169160
new ToolboxItemAttribute(false));
@@ -177,11 +168,11 @@ private void AddDescriptions(AttributeTableBuilder builder)
177168
{
178169
if (IsBrowsable(type))
179170
{
180-
builder.AddCustomAttributes(typeID, propertyName, new DescriptionAttribute(desc));
171+
builder.AddCustomAttributes(typeName, propertyName, new DescriptionAttribute(desc));
181172
}
182173
else //Hide from intellisense
183174
{
184-
builder.AddCustomAttributes(typeID, new BrowsableAttribute(false));
175+
builder.AddCustomAttributes(typeName, new BrowsableAttribute(false));
185176
}
186177
}
187178
}

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55
using System;
66
using Windows.UI.Xaml;
77
using Windows.UI.Xaml.Controls;
8-
9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
using Microsoft.Windows.Design.Metadata;
11-
#else
128
using Microsoft.VisualStudio.DesignTools.Extensibility;
139
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
14-
#endif
1510

1611
namespace Microsoft.Toolkit.Uwp.Design.Types
1712
{

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
88

9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
using Microsoft.Windows.Design;
11-
using Microsoft.Windows.Design.Metadata;
12-
#else
139
using Microsoft.VisualStudio.DesignTools.Extensibility;
1410
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
15-
#endif
1611

1712
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1813
{

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66

77
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
88
{
9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
internal static partial class ControlTypes
11-
{
12-
internal static readonly Type AdaptiveGridView = typeof(AdaptiveGridView);
13-
}
14-
#else
159
internal static partial class ControlTypes
1610
{
1711
internal const string AdaptiveGridView = RootNamespace + "." + nameof(AdaptiveGridView);
@@ -25,5 +19,4 @@ internal static class AdaptiveGridView
2519
internal const string OneRowModeEnabled = nameof(OneRowModeEnabled);
2620
internal const string StretchContentForSingleRow = nameof(StretchContentForSingleRow);
2721
}
28-
#endif
2922
}

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
88

9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
using Microsoft.Windows.Design;
11-
using Microsoft.Windows.Design.Metadata;
12-
#else
139
using Microsoft.VisualStudio.DesignTools.Extensibility;
1410
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
15-
#endif
1611

1712
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1813
{

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66

77
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
88
{
9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
internal static partial class ControlTypes
11-
{
12-
internal static readonly Type BladeItem = typeof(BladeItem);
13-
}
14-
#else
159
internal static partial class ControlTypes
1610
{
1711
internal const string BladeItem = RootNamespace + "." + nameof(BladeItem);
@@ -25,5 +19,4 @@ internal static class BladeItem
2519
internal const string TitleBarBackground = nameof(TitleBarBackground);
2620
internal const string TitleBarVisibility = nameof(TitleBarVisibility);
2721
}
28-
#endif
2922
}

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,9 @@
66

77
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
88

9-
#if VS_DESIGNER_PROCESS_ISOLATION
10-
using Microsoft.Windows.Design;
11-
using Microsoft.Windows.Design.Metadata;
12-
using Microsoft.Windows.Design.PropertyEditing;
13-
#else
149
using Microsoft.VisualStudio.DesignTools.Extensibility;
1510
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
1611
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;
17-
#endif
1812

1913
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
2014
{

0 commit comments

Comments
 (0)