fixup editorconfig

.editorconfig

@@ -1,53 +1,45 @@
-###############################################################################
-# EditorConfig is awesome: http://EditorConfig.org
-###############################################################################
+# EditorConfig is awesome: https://EditorConfig.org
 
-###############################################################################
-# Top-most EditorConfig file
-###############################################################################
+# top-most EditorConfig file
 root = true
 
-###############################################################################
-# Set default behavior to:
-#   a UTF-8 encoding,
-#   Windows-style line endings,
-#   a newline ending the file,
-#   4 space indentation, and
-#   trimming of trailing whitespace
-###############################################################################
+# Don't use tabs for indentation.
 [*]
 charset = utf-8
-end_of_line = crlf
-insert_final_newline = true
 indent_style = space
+# (Please don't specify an indent_size here; that has too many unintended consequences.)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
 indent_size = 4
-trim_trailing_whitespace = true
+insert_final_newline = true
 
-###############################################################################
-# Set file behavior to:
-#   2 space indentation, and
-#   no newline ending the file
-###############################################################################
-[*.{csproj,json,nuspec,proj,projitems,props,resx,ruleset,shproj,targets,vbproj,vcxproj,vcxproj.filters,vsct,vsixmanifest}]
-indent_size = 2
-insert_final_newline = false
-
-###############################################################################
-# Set file behavior to:
-#   2 space indentation
-###############################################################################
-[*.{cmd,config,ps1}]
+# XML project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
 indent_size = 2
 
-###############################################################################
-# Set file behavior to:
-#   tabular indentation
-###############################################################################
-[*.sln]
-indent_style = tab
+# XML config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON files
+[*.json]
+indent_size = 2
+
+# Powershell files
+[*.ps1]
+indent_size = 2
+
+# Shell script files
+[*.sh]
+end_of_line = lf
+indent_size = 2
+
+[*.{cmd,config}]
+indent_size = 2
 
 [*.{cs}]
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the License.txt file in the project root for more information.
 
 # Sort using and Import directives with System.* appearing first
-dotnet_sort_system_directives_first = true
+dotnet_sort_system_directives_first = true

src/dotnet-roslyn-tools/.editorconfig

@@ -1,40 +1,9 @@
 # EditorConfig is awesome: https://EditorConfig.org
 
-# top-most EditorConfig file
-root = true
-
-# Don't use tabs for indentation.
-[*]
-indent_style = space
-# (Please don't specify an indent_size here; that has too many unintended consequences.)
-
 # Code files
 [*.{cs,csx,vb,vbx}]
-indent_size = 4
-insert_final_newline = true
 charset = utf-8-bom
 
-# XML project files
-[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
-indent_size = 2
-
-# XML config files
-[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
-indent_size = 2
-
-# JSON files
-[*.json]
-indent_size = 2
-
-# Powershell files
-[*.ps1]
-indent_size = 2
-
-# Shell script files
-[*.sh]
-end_of_line = lf
-indent_size = 2
-
 # Dotnet code style settings:
 [*.{cs,vb}]
 
@@ -141,8 +110,6 @@ dotnet_naming_symbols.all_members.applicable_kinds = *
 
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 
-file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information.
-
 # IDE0055: Fix formatting
 # Workaround for https://github.com/dotnet/roslyn/issues/70570
 dotnet_diagnostic.IDE0055.severity = warning
@@ -238,10 +205,9 @@ csharp_space_between_square_brackets = false
 
 # Namespace preferences
 csharp_style_namespace_declarations = file_scoped
-dotnet_diagnostic.IDE0161.severity = warning
 
+# Constructor preferences
 csharp_style_prefer_primary_constructors = true
-dotnet_diagnostic.IDE0290.severity = warning
 
 # IDE0011: Add braces
 csharp_prefer_braces = when_multiline:warning