Skip to content

Commit 65af703

Browse files
committed
Code Cleanup — Design projects only
Usings, newline and indent changes as specified in EditorConfig
1 parent b796cf0 commit 65af703

34 files changed

+401
-407
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.ComponentModel;
6+
57
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
68
using Microsoft.Windows.Design;
79
//using Microsoft.Windows.Design.Features;
810
using Microsoft.Windows.Design.Metadata;
911
//using Microsoft.Windows.Design.Model;
10-
using System.ComponentModel;
1112

1213
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1314
{

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

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

55
using System;
66
using System.Reflection;
7-
using Microsoft.Windows.Design.Metadata;
7+
88
using Microsoft.Toolkit.Uwp.Design.Common;
9+
using Microsoft.Windows.Design.Metadata;
910

1011
[assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))]
1112

@@ -16,7 +17,7 @@ public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeT
1617
public MetadataRegistration() : base()
1718
{
1819
// Note:
19-
// The default constructor sets value of AssemblyFullName and
20+
// The default constructor sets value of AssemblyFullName and
2021
// XmlResourceName used by MetadataRegistrationBase.AddDescriptions().
2122
// The convention here is that the <RootNamespace> in .design.csproj
2223
// (or Default namespace in Project -> Properties -> Application tab)

Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs

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

55
using System.Reflection;
6-
using System.Resources;
7-
using System.Runtime.CompilerServices;
86
using System.Runtime.InteropServices;
9-
using System.Windows;
107

11-
// General Information about an assembly is controlled through the following
8+
// General Information about an assembly is controlled through the following
129
// set of attributes. Change these attribute values to modify the information
1310
// associated with an assembly.
1411
[assembly: AssemblyTitle("Windows Community Toolkit Controls DataGrid (Design)")]
@@ -20,12 +17,12 @@
2017
[assembly: AssemblyTrademark("")]
2118
[assembly: AssemblyCulture("")]
2219

23-
// Setting ComVisible to false makes the types in this assembly not visible
24-
// to COM components. If you need to access a type in this assembly from
20+
// Setting ComVisible to false makes the types in this assembly not visible
21+
// to COM components. If you need to access a type in this assembly from
2522
// COM, set the ComVisible attribute to true on that type.
2623
[assembly: ComVisible(false)]
2724

28-
//In order to begin building localizable applications, set
25+
//In order to begin building localizable applications, set
2926
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
3027
//inside a <PropertyGroup>. For example, if you are using US English
3128
//in your source files, set the <UICulture> to en-US. Then uncomment

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Microsoft.Windows.Design.Metadata;
65
using System;
76
using System.Collections.Generic;
87
using System.ComponentModel;
@@ -13,6 +12,8 @@
1312
using System.Reflection;
1413
using System.Xml.Linq;
1514

15+
using Microsoft.Windows.Design.Metadata;
16+
1617
namespace Microsoft.Toolkit.Uwp.Design.Common
1718
{
1819
public class MetadataRegistrationBase
@@ -22,10 +23,10 @@ public class MetadataRegistrationBase
2223
internal MetadataRegistrationBase() { }
2324

2425
/// <summary>
25-
/// Build design time metadata attribute table.
26-
/// </summary>
27-
/// <returns>Custom attribute table.</returns>
28-
protected virtual AttributeTable BuildAttributeTable()
26+
/// Build design time metadata attribute table.
27+
/// </summary>
28+
/// <returns>Custom attribute table.</returns>
29+
protected virtual AttributeTable BuildAttributeTable()
2930
{
3031
AttributeTableBuilder builder = new AttributeTableBuilder();
3132

@@ -37,7 +38,7 @@ protected virtual AttributeTable BuildAttributeTable()
3738
}
3839

3940
/// <summary>
40-
/// Find all AttributeTableBuilder subclasses in the assembly
41+
/// Find all AttributeTableBuilder subclasses in the assembly
4142
/// and add their attributes to the assembly attribute table.
4243
/// </summary>
4344
/// <param name="builder">The assembly attribute table builder.</param>

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

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

55
using System;
6+
67
using Microsoft.Windows.Design.Metadata;
8+
79
using Windows.UI.Xaml;
810

911
namespace Microsoft.Toolkit.Uwp.Design.Types
@@ -27,7 +29,7 @@ public static bool IsBrowsable(object editorBrowsableAttribute)
2729
System.ComponentModel.EditorBrowsableState.Never;
2830
return true;
2931
}
30-
32+
3133
public static class Control
3234
{
3335
public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");

Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System;
65
using System.Diagnostics.CodeAnalysis;
7-
using System.Linq.Expressions;
86

97
[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")]
108

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.ComponentModel;
6+
57
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
68
using Microsoft.Windows.Design;
7-
using Microsoft.Windows.Design.Features;
89
using Microsoft.Windows.Design.Metadata;
9-
using Microsoft.Windows.Design.Model;
10-
using Microsoft.Windows.Design.PropertyEditing;
11-
using System.ComponentModel;
1210

1311
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1412
{
15-
internal class CustomDialogMetadata : AttributeTableBuilder
16-
{
17-
public CustomDialogMetadata()
18-
: base()
19-
{
13+
internal class CustomDialogMetadata : AttributeTableBuilder
14+
{
15+
public CustomDialogMetadata()
16+
: base()
17+
{
2018
AddCallback(typeof(AdaptiveGridView),
2119
b =>
2220
{
@@ -40,6 +38,6 @@ public CustomDialogMetadata()
4038
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
4139
}
4240
);
43-
}
44-
}
41+
}
42+
}
4543
}

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.ComponentModel;
6+
57
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
68
using Microsoft.Windows.Design;
7-
using Microsoft.Windows.Design.Features;
89
using Microsoft.Windows.Design.Metadata;
9-
using Microsoft.Windows.Design.Model;
10-
using Microsoft.Windows.Design.PropertyEditing;
11-
using System.ComponentModel;
1210

1311
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1412
{
1513

16-
internal class BladeItemMetadata : AttributeTableBuilder
17-
{
18-
public BladeItemMetadata()
19-
: base()
20-
{
14+
internal class BladeItemMetadata : AttributeTableBuilder
15+
{
16+
public BladeItemMetadata()
17+
: base()
18+
{
2119
AddCallback(typeof(BladeItem),
2220
b =>
2321
{
@@ -40,6 +38,6 @@ public BladeItemMetadata()
4038
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
4139
}
4240
);
43-
}
44-
}
41+
}
42+
}
4543
}

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.ComponentModel;
6+
57
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
68
using Microsoft.Windows.Design;
7-
using Microsoft.Windows.Design.Features;
89
using Microsoft.Windows.Design.Metadata;
9-
using Microsoft.Windows.Design.Model;
1010
using Microsoft.Windows.Design.PropertyEditing;
11-
using System.ComponentModel;
1211

1312
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1413
{
1514

16-
internal class BladeViewMetadata : AttributeTableBuilder
17-
{
18-
public BladeViewMetadata()
19-
: base()
20-
{
15+
internal class BladeViewMetadata : AttributeTableBuilder
16+
{
17+
public BladeViewMetadata()
18+
: base()
19+
{
2120
AddCallback(typeof(BladeView),
2221
b =>
2322
{
@@ -43,6 +42,6 @@ public BladeViewMetadata()
4342
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
4443
}
4544
);
46-
}
47-
}
45+
}
46+
}
4847
}

Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.ComponentModel;
6+
57
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
68
using Microsoft.Windows.Design;
79
using Microsoft.Windows.Design.Metadata;
8-
using Microsoft.Windows.Design.PropertyEditing;
9-
using System.ComponentModel;
1010

1111
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
1212
{
13-
internal class CarouselMetadata : AttributeTableBuilder
14-
{
13+
internal class CarouselMetadata : AttributeTableBuilder
14+
{
1515
public CarouselMetadata()
16-
: base()
17-
{
18-
AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Carousel),
19-
b =>
20-
{
16+
: base()
17+
{
18+
AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Carousel),
19+
b =>
20+
{
2121
b.AddCustomAttributes(nameof(Carousel.SelectedItem), new CategoryAttribute(Properties.Resources.CategoryCommon));
2222
b.AddCustomAttributes(nameof(Carousel.SelectedIndex), new CategoryAttribute(Properties.Resources.CategoryCommon));
2323
b.AddCustomAttributes(nameof(Carousel.TransitionDuration), new CategoryAttribute(Properties.Resources.CategoryCommon));
@@ -30,8 +30,8 @@ public CarouselMetadata()
3030
b.AddCustomAttributes(nameof(Carousel.ItemRotationZ), new CategoryAttribute(Properties.Resources.CategoryCommon));
3131
b.AddCustomAttributes(nameof(Carousel.Orientation), new CategoryAttribute(Properties.Resources.CategoryCommon));
3232
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
33-
}
34-
);
35-
}
36-
}
33+
}
34+
);
35+
}
36+
}
3737
}

0 commit comments

Comments
 (0)