From da7776d3f1473ee3f26c6f62d20afdc62b107f19 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Sat, 16 Aug 2025 23:08:59 +0200 Subject: [PATCH 1/9] feat: target net9 for GE 6.0 add .editorconfig from GE to suppress WFO1000 The complete config is included, with many settings. --- .editorconfig | 306 ++++++++++++++++++ Directory.Build.props | 4 +- README.md | 1 + appveyor.yml | 2 +- .../GitExtensions.GerritPlugin.nuspec | 6 +- 5 files changed, 313 insertions(+), 6 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bb03e22 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,306 @@ +; Visual Studio Extension : http://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328 +; See http://editorconfig.org/ for more informations +; Top-most EditorConfig file +root = true + +; 4-column space indentation +[*] +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +tab_width = 4 +end_of_line = crlf +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_prefer_collection_expression = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +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:suggestion +dotnet_style_readonly_field = true:suggestion +dotnet_style_predefined_type_for_locals_parameters_members = true:none +dotnet_style_predefined_type_for_member_access = true:none +dotnet_style_require_accessibility_modifiers = for_non_interface_members:none +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:suggestion +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:none +dotnet_style_qualification_for_field = false:none +dotnet_style_qualification_for_property = false:none +dotnet_style_qualification_for_method = false:none +dotnet_style_qualification_for_event = false:none + +[*.{csproj,vcxproj}] +indent_style = space +indent_size = 2 +insert_final_newline = false + +[*.{props,targets}] +indent_size = 2 + +[*.Designer.cs] +trim_trailing_whitespace = false + +[*.{xml,config,nuspec,xslt,wxs}] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true + +[*.{patch,diff}] +trim_trailing_whitespace = false + +[*.blame] +trim_trailing_whitespace = false + +[*.resx] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = false + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# New line preferences +insert_final_newline = true + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = true + +# this. and Me. preferences +dotnet_style_qualification_for_event = false:none +dotnet_style_qualification_for_field = false:none +dotnet_style_qualification_for_method = false:none +dotnet_style_qualification_for_property = false:none + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true:none +dotnet_style_predefined_type_for_member_access = true:none + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:none + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members:none + +# Expression-level preferences +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_object_initializer = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion + +# Field preferences +dotnet_style_readonly_field = true:suggestion + +# Parameter preferences +dotnet_code_quality_unused_parameters = all:suggestion + +#### C# Coding Conventions #### + +# Avoid var +csharp_style_var_for_built_in_types = false:warning +csharp_style_var_when_type_is_apparent = false:warning +csharp_style_var_elsewhere = false:warning + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = false:silent + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_prefer_switch_expression = true:silent + +# Null-checking preferences +csharp_style_conditional_delegate_call = true:suggestion + +# Modifier preferences +csharp_prefer_static_local_function = true:suggestion +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async + +# Code-block preferences +csharp_prefer_braces = true:none +csharp_prefer_simple_using_statement = true:suggestion + +# Expression-level preferences +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_style_prefer_index_operator = true:suggestion +csharp_style_prefer_range_operator = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_unused_value_assignment_preference = discard_variable:suggestion +csharp_style_unused_value_expression_statement_preference = discard_variable:silent + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace:none + +# Use new(...) +dotnet_diagnostic.IDE0090.severity = warning + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = no_change +csharp_indent_switch_labels = 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_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +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 + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +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 = suggestion +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 = suggestion +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_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 = _ + +# 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.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 = + +# 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.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 + +# SA1135: Using directives should be qualified +dotnet_diagnostic.SA1135.severity = none + +# SA1629: Documentation text should end with a period +dotnet_diagnostic.SA1629.severity = none +csharp_style_namespace_declarations = block_scoped:silent +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_prefer_null_check_over_type_check = true:suggestion +csharp_style_prefer_local_over_anonymous_function = true:suggestion +csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion +csharp_style_prefer_tuple_swap = true:suggestion +csharp_style_prefer_utf8_string_literals = true:suggestion +csharp_style_prefer_readonly_struct = true:suggestion +csharp_style_prefer_readonly_struct_member = 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_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 +csharp_style_prefer_pattern_matching = true:silent +csharp_style_prefer_not_pattern = true:suggestion +csharp_style_prefer_extended_property_pattern = true:suggestion +csharp_prefer_system_threading_lock = true:suggestion + +# WFO1000: A property should determine its property content serialization with the DesignerSerializationVisibilityAttribute, DefaultValueAttribute or the ShouldSerializeProperty method +# Silent for now, see https://github.com/dotnet/winforms/issues/12476 +dotnet_diagnostic.WFO1000.severity = silent + +# WFO5001: Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +dotnet_diagnostic.WFO5001.severity = silent diff --git a/Directory.Build.props b/Directory.Build.props index dbe0a89..b645de5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ true - net8.0-windows7.0 - 3.0.0 + net9.0-windows + 3.1.0 diff --git a/README.md b/README.md index 559511f..1f08f54 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Use the following pattern to link revision data to Gerrit: | 4.1.x <= v <= 4.2.0 | 2.0.6 <= v | | 4.2.x <= v <= 5.0.0 | 2.0.7 <= v | | 5.0.x <= v | 3.0.0 <= v | +| 6.0.1 <= v | 3.1.0 <= v | ## GitExtensions Plugin Template information diff --git a/appveyor.yml b/appveyor.yml index 37702f3..3702db4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ #---------------------------------# # version format -version: 3.0.0.{build} +version: 3.1.0.{build} # version suffix, if any (e.g. '-RC1', '-beta' otherwise '') environment: diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec index 1aae156..2bfb60d 100644 --- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec +++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec @@ -13,15 +13,15 @@ - - + + - + \ No newline at end of file From ba293bdceee82e34b20c1a885cf7e9377b13a7ca Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Sun, 17 Aug 2025 23:41:33 +0200 Subject: [PATCH 2/9] fixup! feat: target net9 for GE 6.0 update version of GitExtensions.Extensibility to merged version add .editorconfig from GE to suppress WFO1000 The complete config is included, with many settings. --- Directory.Packages.props | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5a79b5f..08bb3d6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,12 +5,12 @@ true - + - + - - + + diff --git a/README.md b/README.md index 1f08f54..dfac891 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Use the following pattern to link revision data to Gerrit: | 4.0.1 <= v <= 4.0.2 | 2.0.5 | | 4.1.x <= v <= 4.2.0 | 2.0.6 <= v | | 4.2.x <= v <= 5.0.0 | 2.0.7 <= v | -| 5.0.x <= v | 3.0.0 <= v | +| 5.0.x <= 6.0.0 | 3.0.0 <= v | | 6.0.1 <= v | 3.1.0 <= v | ## GitExtensions Plugin Template information From afd968af343e3678e84342e92c367808940764d9 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Tue, 26 Aug 2025 23:14:08 +0200 Subject: [PATCH 3/9] fixup! updated version --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 08bb3d6..ce490f3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + From fcafc5a201ce857f684f010f25333393c191d88b Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Wed, 27 Aug 2025 23:26:17 +0200 Subject: [PATCH 4/9] fixup! dependency version 0.4.* --- Directory.Packages.props | 2 +- .../GitExtensions.GerritPlugin.nuspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ce490f3..1edc431 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec index 2bfb60d..8fd761c 100644 --- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec +++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec @@ -11,11 +11,11 @@ Resources\IconGerrit.png - + - + From 4e600d9003009b9b92a38f65b03358d43765a3fc Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Wed, 27 Aug 2025 23:48:47 +0200 Subject: [PATCH 5/9] fixup! dependency version 0.4.* --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1edc431..ce490f3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + From db685a60c1d27ab8b761db5e9e1df7f753fbc33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 10 Sep 2025 19:12:00 +0200 Subject: [PATCH 6/9] Debug CI build --- appveyor.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 3702db4..6745b2d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,6 +46,12 @@ build: # MSBuild verbosity level verbosity: quiet +# Add a custom build_script that invokes MSBuild with binary logging enabled. +build_script: +- ps: | + Write-Host "Building solution with dotnet and creating binary log..." + dotnet build .\GitExtensions.GerritPlugin.sln -c $env:APPVEYOR_BUILD_CONFIGURATION --no-restore -bl:msbuild.binlog + #---------------------------------# # artifacts configuration # #---------------------------------# @@ -53,6 +59,9 @@ build: artifacts: - path: '**\GitExtensions.GerritPlugin.*.nupkg' name: NuGet +# Add the MSBuild binary log so it can be downloaded from the build artifacts +- path: msbuild.binlog + name: MSBuildBinLog deploy: - provider: NuGet From 9a679cd88a61b5acbca12694e3be4a8b5271a54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 10 Sep 2025 19:24:23 +0200 Subject: [PATCH 7/9] Debug CI build --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6745b2d..1234cea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,7 +50,7 @@ build: build_script: - ps: | Write-Host "Building solution with dotnet and creating binary log..." - dotnet build .\GitExtensions.GerritPlugin.sln -c $env:APPVEYOR_BUILD_CONFIGURATION --no-restore -bl:msbuild.binlog + dotnet build .\GitExtensions.GerritPlugin.sln -c Release --no-restore -bl:msbuild.binlog #---------------------------------# # artifacts configuration # From 74c97700845bef5fac8f141f61802197d02aa4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 10 Sep 2025 19:41:13 +0200 Subject: [PATCH 8/9] Download reference GitExtensions from AppVeyor --- .../GitExtensions.GerritPlugin.csproj.user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user index 7d245af..20856c6 100644 --- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user +++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user @@ -6,7 +6,7 @@ latest - GitHub + AppVeyor $(GitExtensionsDownloadPath) From 007931fcd3e9fecb7a0e57bba4289aacd0d82e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 10 Sep 2025 19:54:12 +0200 Subject: [PATCH 9/9] Revert "Debug CI build" This reverts commit 9a679cd88a61b5acbca12694e3be4a8b5271a54c. Revert "Debug CI build" This reverts commit db685a60c1d27ab8b761db5e9e1df7f753fbc33e. --- appveyor.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1234cea..3702db4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,12 +46,6 @@ build: # MSBuild verbosity level verbosity: quiet -# Add a custom build_script that invokes MSBuild with binary logging enabled. -build_script: -- ps: | - Write-Host "Building solution with dotnet and creating binary log..." - dotnet build .\GitExtensions.GerritPlugin.sln -c Release --no-restore -bl:msbuild.binlog - #---------------------------------# # artifacts configuration # #---------------------------------# @@ -59,9 +53,6 @@ build_script: artifacts: - path: '**\GitExtensions.GerritPlugin.*.nupkg' name: NuGet -# Add the MSBuild binary log so it can be downloaded from the build artifacts -- path: msbuild.binlog - name: MSBuildBinLog deploy: - provider: NuGet