diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 155eef78a7..0000000000 --- a/.editorconfig +++ /dev/null @@ -1,184 +0,0 @@ -; This file is for unifying the coding style for different editors and IDEs. -; More information at http://EditorConfig.org - -root = true - -[*] -end_of_line = crlf - -[*.ps1] -indent_style = space -indent_size = 4 - -[*.cs] -dotnet_diagnostic.RS0030.severity=error -dotnet_diagnostic.RS0031.severity=error -dotnet_diagnostic.RS0035.severity=error -csharp_using_directive_placement = outside_namespace:warning -csharp_prefer_simple_using_statement = true:suggestion -csharp_prefer_braces = true:error -csharp_style_namespace_declarations = block_scoped:error -csharp_style_prefer_method_group_conversion = true:silent -csharp_style_prefer_top_level_statements = false:error -csharp_style_expression_bodied_methods = false:warning -csharp_style_expression_bodied_constructors = false:warning -csharp_style_expression_bodied_operators = false:warning -csharp_style_expression_bodied_properties = false:warning -csharp_style_expression_bodied_indexers = false:warning -csharp_style_expression_bodied_accessors = false:warning -csharp_style_expression_bodied_lambdas = true:silent -csharp_style_expression_bodied_local_functions = false:error -csharp_indent_labels = no_change -csharp_space_around_binary_operators = before_and_after -csharp_style_throw_expression = true:silent -csharp_style_prefer_null_check_over_type_check = true:error -csharp_prefer_simple_default_expression = true:suggestion -csharp_style_prefer_local_over_anonymous_function = true:suggestion -csharp_style_prefer_index_operator = true:suggestion -csharp_style_implicit_object_creation_when_type_is_apparent = false:warning -csharp_style_prefer_range_operator = true:suggestion -csharp_style_prefer_tuple_swap = true:suggestion -csharp_style_prefer_utf8_string_literals = true:suggestion -csharp_style_deconstructed_variable_declaration = true:suggestion -csharp_style_inlined_variable_declaration = true:suggestion -csharp_style_unused_value_expression_statement_preference = discard_variable:silent -csharp_style_unused_value_assignment_preference = discard_variable:suggestion -csharp_prefer_static_local_function = true:suggestion -csharp_style_prefer_readonly_struct = true:suggestion -csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent -csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent -csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent -csharp_style_conditional_delegate_call = true:suggestion -csharp_style_prefer_switch_expression = true:suggestion -csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion -csharp_style_prefer_pattern_matching = true:suggestion -csharp_style_prefer_not_pattern = true:suggestion -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion -csharp_style_prefer_extended_property_pattern = true:suggestion -csharp_style_var_for_built_in_types = true:warning -csharp_style_var_when_type_is_apparent = true:warning -csharp_style_var_elsewhere = false:silent -csharp_style_prefer_primary_constructors = false:error -csharp_style_prefer_readonly_struct_member = true:suggestion -csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent -csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent - -[*.{cs,vb}] -#### Naming styles #### - -# Naming rules - -dotnet_naming_rule.interface_should_be_begins_with_i.severity = error -dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface -dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i - -dotnet_naming_rule.types_should_be_pascal_case.severity = error -dotnet_naming_rule.types_should_be_pascal_case.symbols = types -dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = error -dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members -dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.private_fields_should_be_camel_case_underscore_prefix.severity = error -dotnet_naming_rule.private_fields_should_be_camel_case_underscore_prefix.symbols = private_fields -dotnet_naming_rule.private_fields_should_be_camel_case_underscore_prefix.style = camel_case_underscore_prefix - -dotnet_naming_rule.non_private_fields_should_be_pascal_case.severity = error -dotnet_naming_rule.non_private_fields_should_be_pascal_case.symbols = non_private_fields -dotnet_naming_rule.non_private_fields_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.local_variables_should_be_camel_case.severity = error -dotnet_naming_rule.local_variables_should_be_camel_case.symbols = local_variables -dotnet_naming_rule.local_variables_should_be_camel_case.style = camel_case - -dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = error -dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields -dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case - -# Symbol specifications - -dotnet_naming_symbols.interface.applicable_kinds = interface -dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = - -dotnet_naming_symbols.non_private_fields.applicable_kinds = field -dotnet_naming_symbols.non_private_fields.applicable_accessibilities = public, internal, protected, protected_internal -dotnet_naming_symbols.non_private_fields.required_modifiers = - -dotnet_naming_symbols.private_fields.applicable_kinds = field -dotnet_naming_symbols.private_fields.applicable_accessibilities = private, private_protected -dotnet_naming_symbols.private_fields.required_modifiers = - -dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = - -dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method -dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = - -dotnet_naming_symbols.local_variables.applicable_kinds = parameter, local -dotnet_naming_symbols.local_variables.applicable_accessibilities = local -dotnet_naming_symbols.local_variables.required_modifiers = - -dotnet_naming_symbols.constant_fields.applicable_kinds = field -dotnet_naming_symbols.constant_fields.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.constant_fields.required_modifiers = const - -# Naming styles - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.camel_case.required_prefix = -dotnet_naming_style.camel_case.required_suffix = -dotnet_naming_style.camel_case.word_separator = -dotnet_naming_style.camel_case.capitalization = camel_case - -dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = -dotnet_naming_style.begins_with_i.capitalization = pascal_case - -dotnet_naming_style.camel_case_underscore_prefix.required_prefix = _ -dotnet_naming_style.camel_case_underscore_prefix.required_suffix = -dotnet_naming_style.camel_case_underscore_prefix.word_separator = -dotnet_naming_style.camel_case_underscore_prefix.capitalization = camel_case - -dotnet_style_operator_placement_when_wrapping = beginning_of_line -tab_width = 4 -indent_size = 4 -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning -dotnet_style_prefer_auto_properties = true:warning -dotnet_style_object_initializer = true:warning -dotnet_style_collection_initializer = true:warning -dotnet_style_prefer_simplified_boolean_expressions = true:warning -dotnet_style_prefer_conditional_expression_over_assignment = true:silent -dotnet_style_prefer_conditional_expression_over_return = true:silent -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_prefer_inferred_tuple_names = true:suggestion -dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion -dotnet_style_prefer_compound_assignment = true:suggestion -dotnet_style_prefer_simplified_interpolation = true:suggestion -dotnet_style_namespace_match_folder = true:error -dotnet_style_readonly_field = true:suggestion -dotnet_style_predefined_type_for_locals_parameters_members = true:warning -dotnet_style_predefined_type_for_member_access = true:warning -dotnet_style_require_accessibility_modifiers = for_non_interface_members:error -dotnet_style_allow_multiple_blank_lines_experimental = true:silent -dotnet_style_allow_statement_immediately_after_block_experimental = true:silent -dotnet_code_quality_unused_parameters = all:error -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent -dotnet_style_qualification_for_property = false:error -dotnet_style_qualification_for_field = false:error -dotnet_style_qualification_for_method = false:error -dotnet_style_qualification_for_event = false:error -dotnet_style_prefer_collection_expression = true:suggestion diff --git a/.gitignore b/.gitignore index 5626fb31ee..58b7903074 100644 --- a/.gitignore +++ b/.gitignore @@ -54,4 +54,7 @@ tools/** !tools/Modules/packages.config BuildArtifacts/ code_drop/ -src/chocolatey.install/assets/Install.ps1 \ No newline at end of file +src/chocolatey.install/assets/Install.ps1 + +# This project uses an editorconfig file maintained via a nuget package, so do not commit any of these to the repo +.editorconfig \ No newline at end of file diff --git a/src/chocolatey.console/chocolatey.console.csproj b/src/chocolatey.console/chocolatey.console.csproj index 3da9b03260..421d939972 100644 --- a/src/chocolatey.console/chocolatey.console.csproj +++ b/src/chocolatey.console/chocolatey.console.csproj @@ -1,5 +1,6 @@  + Debug x86 @@ -16,6 +17,8 @@ 512 ..\ true + + x86 @@ -248,4 +251,12 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/src/chocolatey.console/packages.config b/src/chocolatey.console/packages.config index be3de666cc..19f3237e22 100644 --- a/src/chocolatey.console/packages.config +++ b/src/chocolatey.console/packages.config @@ -1,6 +1,7 @@  + diff --git a/src/chocolatey.sln b/src/chocolatey.sln index 8bbca092e6..1c21864966 100644 --- a/src/chocolatey.sln +++ b/src/chocolatey.sln @@ -37,7 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chocolatey.lib", "chocolate EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "toplevel", "toplevel", "{18FEFF9F-7352-4230-8B4E-E8D8BE976095}" ProjectSection(SolutionItems) = preProject - ..\.editorconfig = ..\.editorconfig ..\CHANGELOG.md = ..\CHANGELOG.md ..\CHANGELOG_LICENSED.md = ..\CHANGELOG_LICENSED.md ..\COMMITTERS.md = ..\COMMITTERS.md