Skip to content

Commit

Permalink
Updated project to .NET 6 (#70)
Browse files Browse the repository at this point in the history
- Updated project to .NET 6
- Added stylecop and editor config
- Fixed styling issued
  • Loading branch information
MilleBo authored Dec 26, 2021
1 parent 8c9cb59 commit 277fea5
Show file tree
Hide file tree
Showing 114 changed files with 692 additions and 672 deletions.
314 changes: 314 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,314 @@
# editorconfig.org

# top-most EditorConfig file
root = true

# C# files
# Options in the same order as they are presented in VS Options -> Text Editor -> C# -> Code Style

[*.cs]

# tabs
insert_final_newline = true
indent_style = space
indent_size = 4
end_of_line = crlf
trim_trailing_whitespace = true
max_line_length = 100

# CODE STYLE
# defaults
dotnet_sort_system_directives_first = true

# use this
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# use language keywords instead of BCL types
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# only use var when it's obvious what the variable type is
csharp_style_var_elsewhere = true:suggestion
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion

# expression-bodied members
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none
csharp_style_expression_bodied_properties = true:suggestion
csharp_style_expression_bodied_indexers = true:suggestion
csharp_style_expression_bodied_accessors = true:suggestion

# expression-level preferences
dotnet_style_object_initializer = true:none
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion

# variable-level preferences
csharp_style_inlined_variable_declaration = true:suggestion

# null checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion

# FORMATTING
# indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left

# new line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
#csharp_new_line_within_query_expression_clauses = true

# space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_between_parentheses = false

csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = ignore
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
#csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

#NAMING
# name all constant fields using PascalCase
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style

dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.required_modifiers = const
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# name all static readonly fields using PascalCase
dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.symbols = static_readonly_fields
dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.style = pascal_case_style

dotnet_naming_symbols.static_readonly_fields.applicable_kinds = field
dotnet_naming_symbols.static_readonly_fields.required_modifiers = static,readonly
dotnet_naming_symbols.static_readonly_fields.applicable_accessibilities = *

# internal and private fields should be camelCase
dotnet_naming_rule.private_members_with_underscore.symbols = private_fields
dotnet_naming_rule.private_members_with_underscore.style = prefix_underscore
dotnet_naming_rule.private_members_with_underscore.severity = suggestion

dotnet_naming_symbols.private_fields.applicable_kinds = field
dotnet_naming_symbols.private_fields.applicable_accessibilities = private

dotnet_naming_style.prefix_underscore.capitalization = camel_case
dotnet_naming_style.prefix_underscore.required_prefix = _

dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal

dotnet_naming_style.camel_case_style.capitalization = camel_case

# async methods end in Async
dotnet_naming_rule.async_methods_must_end_with_async.severity = suggestion
dotnet_naming_rule.async_methods_must_end_with_async.symbols = async_method_symbols
dotnet_naming_rule.async_methods_must_end_with_async.style = end_in_async_style

dotnet_naming_symbols.async_method_symbols.applicable_kinds = method
dotnet_naming_symbols.async_method_symbols.required_modifiers = async
dotnet_naming_symbols.async_method_symbols.applicable_accessibilities = *

dotnet_naming_style.end_in_async_style.capitalization = pascal_case
dotnet_naming_style.end_in_async_style.required_suffix = Async

# interfaces start with I
dotnet_naming_rule.interfaces_must_start_with_i.severity = error
dotnet_naming_rule.interfaces_must_start_with_i.symbols = interface_symbols
dotnet_naming_rule.interfaces_must_start_with_i.style = begin_with_i_style

dotnet_naming_symbols.interface_symbols.applicable_kinds = interface
dotnet_naming_symbols.interface_symbols.applicable_accessibilities = *

dotnet_naming_style.begin_with_i_style.capitalization = pascal_case
dotnet_naming_style.begin_with_i_style.required_prefix = I

# name everything else using PascalCase
dotnet_naming_rule.methods_and_properties_must_be_pascal_case.severity = suggestion
dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols = everything_else_symbols
dotnet_naming_rule.methods_and_properties_must_be_pascal_case.style = pascal_case_style

#dotnet_naming_symbols.everything_else_symbols.applicable_kinds = class,struct,enum,delegate,event,method,property,namespace,type_parameter
dotnet_naming_symbols.everything_else_symbols.applicable_kinds = class,struct,enum,delegate,event,method,property
dotnet_naming_symbols.everything_else_symbols.applicable_accessibilities = *

# StyleCop diagnostics severity
dotnet_diagnostic.SA0001.severity = suggestion
dotnet_diagnostic.SA1000.severity = suggestion
dotnet_diagnostic.SA1009.severity = none
dotnet_diagnostic.SA1101.severity = none
dotnet_diagnostic.SA1118.severity = none
dotnet_diagnostic.SA1200.severity = none
dotnet_diagnostic.SA1208.severity = none
dotnet_diagnostic.SA1305.severity = warning
dotnet_diagnostic.SA1309.severity = none
dotnet_diagnostic.SA1413.severity = none
dotnet_diagnostic.SA1512.severity = none
dotnet_diagnostic.SA1515.severity = none
dotnet_diagnostic.SA1601.severity = none
dotnet_diagnostic.SA1600.severity = none
dotnet_diagnostic.SA1602.severity = none
dotnet_diagnostic.SA1629.severity = suggestion
dotnet_diagnostic.SA1633.severity = none
dotnet_diagnostic.SA1634.severity = none
dotnet_diagnostic.SA1635.severity = none
dotnet_diagnostic.SA1636.severity = none
dotnet_diagnostic.SA1637.severity = none
dotnet_diagnostic.SA1638.severity = none
dotnet_diagnostic.SA1640.severity = none
dotnet_diagnostic.SA1641.severity = none
dotnet_diagnostic.SA1652.severity = none

# Description: Code analysis rules for this project.

# Code files
[*.{cs,vb}]


dotnet_diagnostic.SA1518.severity = none
dotnet_diagnostic.SA1316.severity = none
dotnet_diagnostic.SA1305.severity = none
dotnet_diagnostic.SA1649.severity = none
dotnet_diagnostic.SA1117.severity = none
dotnet_diagnostic.SA1414.severity = none
dotnet_diagnostic.CS1570.severity = none
dotnet_diagnostic.CA1001.severity = warning
dotnet_diagnostic.CA1009.severity = warning
dotnet_diagnostic.CA1016.severity = warning
dotnet_diagnostic.CA1033.severity = warning
dotnet_diagnostic.CA1049.severity = warning
dotnet_diagnostic.CA1054.severity = none
dotnet_diagnostic.CA1060.severity = warning
dotnet_diagnostic.CA1061.severity = warning
dotnet_diagnostic.CA1063.severity = warning
dotnet_diagnostic.CA1065.severity = warning
dotnet_diagnostic.CA1301.severity = warning
dotnet_diagnostic.CA1400.severity = warning
dotnet_diagnostic.CA1401.severity = warning
dotnet_diagnostic.CA1403.severity = warning
dotnet_diagnostic.CA1404.severity = warning
dotnet_diagnostic.CA1405.severity = warning
dotnet_diagnostic.CA1410.severity = warning
dotnet_diagnostic.CA1415.severity = warning
dotnet_diagnostic.CA1707.severity = none
dotnet_diagnostic.CA1821.severity = warning
dotnet_diagnostic.CA1822.severity = none
dotnet_diagnostic.CA1900.severity = warning
dotnet_diagnostic.CA1901.severity = warning
dotnet_diagnostic.CA2002.severity = warning
dotnet_diagnostic.CA2100.severity = warning
dotnet_diagnostic.CA2101.severity = warning
dotnet_diagnostic.CA2108.severity = warning
dotnet_diagnostic.CA2111.severity = warning
dotnet_diagnostic.CA2112.severity = warning
dotnet_diagnostic.CA2114.severity = warning
dotnet_diagnostic.CA2116.severity = warning
dotnet_diagnostic.CA2117.severity = warning
dotnet_diagnostic.CA2122.severity = warning
dotnet_diagnostic.CA2123.severity = warning
dotnet_diagnostic.CA2124.severity = warning
dotnet_diagnostic.CA2126.severity = warning
dotnet_diagnostic.CA2131.severity = warning
dotnet_diagnostic.CA2132.severity = warning
dotnet_diagnostic.CA2133.severity = warning
dotnet_diagnostic.CA2134.severity = warning
dotnet_diagnostic.CA2137.severity = warning
dotnet_diagnostic.CA2138.severity = warning
dotnet_diagnostic.CA2140.severity = warning
dotnet_diagnostic.CA2141.severity = warning
dotnet_diagnostic.CA2146.severity = warning
dotnet_diagnostic.CA2147.severity = warning
dotnet_diagnostic.CA2149.severity = warning
dotnet_diagnostic.CA2200.severity = warning
dotnet_diagnostic.CA2202.severity = warning
dotnet_diagnostic.CA2207.severity = warning
dotnet_diagnostic.CA2212.severity = warning
dotnet_diagnostic.CA2213.severity = warning
dotnet_diagnostic.CA2214.severity = warning
dotnet_diagnostic.CA2216.severity = warning
dotnet_diagnostic.CA2220.severity = warning
dotnet_diagnostic.CA2229.severity = warning
dotnet_diagnostic.CA2231.severity = warning
dotnet_diagnostic.CA2232.severity = warning
dotnet_diagnostic.CA2234.severity = none
dotnet_diagnostic.CA2235.severity = warning
dotnet_diagnostic.CA2236.severity = warning
dotnet_diagnostic.CA2237.severity = warning
dotnet_diagnostic.CA2238.severity = warning
dotnet_diagnostic.CA2240.severity = warning
dotnet_diagnostic.CA2241.severity = warning
dotnet_diagnostic.CA2242.severity = warning
dotnet_diagnostic.CS0618.severity = none
dotnet_diagnostic.CS1591.severity = none
dotnet_diagnostic.CS8600.severity = none
dotnet_diagnostic.CS8601.severity = none
dotnet_diagnostic.CS8602.severity = none
dotnet_diagnostic.CS8603.severity = none
dotnet_diagnostic.CS8604.severity = none
dotnet_diagnostic.CS8618.severity = none
dotnet_diagnostic.CS8625.severity = none
dotnet_diagnostic.DOC100.severity = warning
dotnet_diagnostic.DOC101.severity = warning
dotnet_diagnostic.DOC102.severity = warning
dotnet_diagnostic.DOC103.severity = warning
dotnet_diagnostic.DOC104.severity = warning
dotnet_diagnostic.DOC105.severity = warning
dotnet_diagnostic.DOC106.severity = warning
dotnet_diagnostic.DOC107.severity = warning
dotnet_diagnostic.DOC108.severity = warning
dotnet_diagnostic.DOC200.severity = warning
dotnet_diagnostic.DOC201.severity = warning
dotnet_diagnostic.DOC202.severity = warning
dotnet_diagnostic.DOC203.severity = warning
dotnet_diagnostic.DOC204.severity = warning

# https://github.com/dotnet/roslyn-analyzers/issues/1803
dotnet_diagnostic.IDE0001.severity = none
dotnet_diagnostic.IDE0002.severity = warning
dotnet_diagnostic.IDE0003.severity = warning
dotnet_diagnostic.IDE0004.severity = warning
dotnet_diagnostic.IDE0005.severity = warning
dotnet_diagnostic.RCS1029.severity = none
dotnet_diagnostic.RCS1090.severity = none
dotnet_diagnostic.RS1022.severity = none

dotnet_diagnostic.UseConfigureAwait.severity = warning
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,5 @@ ModelManifest.xml
.fake/
/src/Testura.Android/Testura.Android.nuspec
/src/Testura.Android/nuget.exe

/.idea/
32 changes: 32 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project>

<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
<NeutralLanguage>en-US</NeutralLanguage>
<IsPackable>false</IsPackable>
<Authors></Authors>
<PackageLicenseExpression></PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>false</PublishRepositoryUrl>
</PropertyGroup>

<PropertyGroup>
<LangVersion>latest</LangVersion>
<Nullable>disable</Nullable>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>CODE_ANALYSIS</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
</ItemGroup>
</Project>
29 changes: 10 additions & 19 deletions Testura.Code.sln
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29318.209
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testura.Code", "src\Testura.Code\Testura.Code.csproj", "{00B9050D-ECCE-45CE-851C-A88BECB912E8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testura.Code", "src\Testura.Code\Testura.Code.csproj", "{995EEDE4-58EE-465B-9BD5-FC06CBF4E469}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testura.Code.Tests", "src\Testura.Code.Tests\Testura.Code.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testura.Code.Tests", "src\Testura.Code.Tests\Testura.Code.Tests.csproj", "{36908994-48DF-405C-97F4-921281947D44}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{00B9050D-ECCE-45CE-851C-A88BECB912E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00B9050D-ECCE-45CE-851C-A88BECB912E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00B9050D-ECCE-45CE-851C-A88BECB912E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00B9050D-ECCE-45CE-851C-A88BECB912E8}.Release|Any CPU.Build.0 = Release|Any CPU
{84491222-6C36-4FA7-BBAE-1FA804129151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{84491222-6C36-4FA7-BBAE-1FA804129151}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84491222-6C36-4FA7-BBAE-1FA804129151}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84491222-6C36-4FA7-BBAE-1FA804129151}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {63883293-39D5-431D-A6EB-3AB046580ACA}
{995EEDE4-58EE-465B-9BD5-FC06CBF4E469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{995EEDE4-58EE-465B-9BD5-FC06CBF4E469}.Debug|Any CPU.Build.0 = Debug|Any CPU
{995EEDE4-58EE-465B-9BD5-FC06CBF4E469}.Release|Any CPU.ActiveCfg = Release|Any CPU
{995EEDE4-58EE-465B-9BD5-FC06CBF4E469}.Release|Any CPU.Build.0 = Release|Any CPU
{36908994-48DF-405C-97F4-921281947D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36908994-48DF-405C-97F4-921281947D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36908994-48DF-405C-97F4-921281947D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36908994-48DF-405C-97F4-921281947D44}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Loading

0 comments on commit 277fea5

Please sign in to comment.