Address feedback.

.editorconfig

@@ -3,20 +3,7 @@
 # You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
 root = true
 
-[*.csproj]
-
-charset = utf-8
-
-# use hard tabs for indentation
-indent_style = tab
-
-# Formatting - set preferred newline characters
-end_of_line = lf
-
-# Formatting - remove any whitespace characters preceding newline characters
-trim_trailing_whitespace = true
-
-[*.cs]
+[*.{cs,csproj}]
 
 charset = utf-8
 
@@ -25,7 +12,18 @@ charset = utf-8
 # use hard tabs for indentation
 indent_style = tab
 
-# Formatting - new line options
+# Formatting - set preferred newline characters
+end_of_line = lf
+
+# Formatting - remove any whitespace characters preceding newline characters
+trim_trailing_whitespace = true
+
+[*.xaml]
+
+indent_style = space
+indent_size = 2
+
+[*.cs]
 
 # require braces to be on a new line for all
 csharp_new_line_before_open_brace = all
@@ -35,12 +33,6 @@ csharp_new_line_before_open_brace = all
 # do not place System.* using directives before other using directives
 dotnet_sort_system_directives_first = true:error
 
-# Formatting - remove any whitespace characters preceding newline characters
-trim_trailing_whitespace = true
-
-# Formatting - set preferred newline characters
-end_of_line = lf
-
 # Formatting - spacing options
 
 # require NO space between a cast and the value
@@ -257,8 +249,4 @@ dotnet_style_prefer_simplified_interpolation = true:error
 dotnet_diagnostic.IDE0004.severity = error
 
 # IDE0019: Use pattern matching
-csharp_style_pattern_matching_over_as_with_null_check = true:error
-
-[*.xaml]
-indent_style = space
-indent_size = 2
+csharp_style_pattern_matching_over_as_with_null_check = true:error