Skip to content

Commit

Permalink
Normalize line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
TrevorPilley committed Dec 24, 2020
1 parent 3024658 commit 5dbc9f4
Show file tree
Hide file tree
Showing 35 changed files with 652 additions and 636 deletions.
53 changes: 34 additions & 19 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# editorconfig.org
# EditorConfig to support per-solution formatting.
# Use the EditorConfig VS add-in to make this work.
# http://editorconfig.org/

# top-most EditorConfig file
root = true
Expand All @@ -11,10 +13,11 @@ insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
charset = utf-8

# JSON files
[*.json]
indent_size = 2
# Generated code
[*{_AssemblyInfo.cs,.notsupported.cs}]
generated_code = true

# C# files
[*.cs]
Expand Down Expand Up @@ -45,9 +48,9 @@ dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# Types: use keywords instead of BCL types, and permit var only when the type is clear
csharp_style_var_for_built_in_types = false:suggestion
csharp_style_var_when_type_is_apparent = false:none
csharp_style_var_elsewhere = false:suggestion
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

Expand Down Expand Up @@ -160,6 +163,15 @@ dotnet_code_quality.CA1802.api_surface = private, internal
# CA1303: Do not pass literals as localized parameters
dotnet_diagnostic.CA1303.severity = none

# CA1304: Specify CultureInfo
dotnet_diagnostic.CA1304.severity = error

# CA1305: Specify IFormatProvider
dotnet_diagnostic.CA1305.severity = error

# CA1310: Specify StringComparison for correctness
dotnet_diagnostic.CA1310.severity = error

# SA1101: Prefix local calls with this
dotnet_diagnostic.SA1101.severity = none

Expand All @@ -172,27 +184,30 @@ dotnet_diagnostic.SA1309.severity = none
# SA1311: Static readonly fields should begin with upper-case letter
dotnet_diagnostic.SA1311.severity = none

# C++ Files
[*.{cpp,h,in}]
curly_bracket_next_line = true
indent_brace_style = Allman
# Xml files
[*.{xml,stylecop,resx,ruleset}]
indent_size = 2

# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
# Xml config files
[*.{props,targets,config,nuspec}]
indent_size = 2

# Xml build files
[*.builds]
# Xml project files
[*.csproj]
indent_size = 2

# Xml files
[*.{xml,stylecop,resx,ruleset}]
# YAML config files
[*.{yml,yaml}]
indent_size = 2

# Xml config files
[*.{props,targets,config,nuspec}]
# JSON files
[*.json]
indent_size = 2

# PowerShell scripts
[*.{ps1,psm1}]
end_of_line = crlf

# Shell scripts
[*.sh]
end_of_line = lf
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
*.userosscache
*.sln.docstates

# macOS
*.DS_Store

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

Expand Down
2 changes: 1 addition & 1 deletion PhoneNumbers.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30711.63
Expand Down
Empty file modified build.sh
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion nuget.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
Expand Down
Loading

0 comments on commit 5dbc9f4

Please sign in to comment.