最后的重构

Author: zlzforever

.editorconfig

@@ -1,257 +1,140 @@
-# Schema: http://EditorConfig.org
-# Docs: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
-
-# top-most EditorConfig file
+###############################
+# Core EditorConfig Options   #
+###############################
 root = true
-
-# Don't use tabs for indentation.
+# All files
 [*]
 indent_style = space
-trim_trailing_whitespace = true
-
-# Code files
-[*.{cs,csx,vb,vbx}]
-indent_size = 4
-indent_style = tab
-insert_final_newline = true
-#charset = utf-8-bom
 
-# Xml project files
+# 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,xml,stylecop}]
-indent_size = 2
-
-# JSON files
-[*.json]
-indent_size = 2
-
-# Powershell files
-[*.ps1]
-indent_size = 2
-
-# Shell scripts
-[*.sh]
-end_of_line = lf
-indent_size = 2
-
-[*.{cmd,bat}]
-end_of_line = crlf
+# XML config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
 indent_size = 2
 
-## Language conventions
-# Dotnet code style settings:
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+###############################
+# .NET Coding Conventions     #
+###############################
 [*.{cs,vb}]
-# "This." and "Me." qualifiers
+# Organize usings
+dotnet_sort_system_directives_first = true
+# this. preferences
 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
-
-# Language keywords instead of framework type names for type references
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+# Language keywords vs BCL types preferences
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
-
-# Modifier preferences
-dotnet_style_require_accessibility_modifiers = always:suggestion
-dotnet_style_readonly_field = true:warning
-
 # Parentheses preferences
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
-
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
 # Expression-level preferences
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
-dotnet_style_prefer_conditional_expression_over_return = true:suggestion
-
-# Null-checking preferences
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-
-# CSharp code style settings:
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+# Use PascalCase for constant fields
+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.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+###############################
+# C# Coding Conventions       #
+###############################
 [*.cs]
-# Modifier preferences
-csharp_preferred_modifier_order = public,private,protected,internal,const,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
-
-# Implicit and explicit types
+# var preferences
 csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = true:suggestion
-
 # Expression-bodied members
-# Explicitly disabled due to difference in coding style between source and tests
-#csharp_style_expression_bodied_methods = false:silent
-#csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
 csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:suggestion
-csharp_style_expression_bodied_indexers = true:suggestion
-csharp_style_expression_bodied_accessors = true:suggestion
-
-# Pattern matching
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-
-# Inlined variable declarations
-csharp_style_inlined_variable_declaration = true:suggestion
-
-# Expression-level preferences
-csharp_prefer_simple_default_expression = true:suggestion
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_style_pattern_local_over_anonymous_function = true:suggestion
-
-# Null-checking preference
+# Null-checking preferences
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
-
-# Code block preferences
-csharp_prefer_braces = true:suggestion
-
-## Formatting conventions
-# Dotnet formatting settings:
-[*.{cs,vb}]
-# Organize usings
-dotnet_sort_system_directives_first = true
-dotnet_separate_import_directive_groups = false
-
-# CSharp formatting settings:
-[*.cs]
-# Newline options
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true # Prefer curly braces even for one line of code
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+# csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+###############################
+# C# Formatting Rules         #
+###############################
+# 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_between_query_expression_clauses = true
-
-# Identation options
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents_when_block = true
-csharp_indent_switch_labels = true
+# Indentation preferences
 csharp_indent_case_contents = true
-csharp_indent_labels = no_change
-
-# Spacing options
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
 csharp_space_after_cast = false
 csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_before_colon_in_inheritance_clause = true
 csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_around_binary_operators = before_and_after
 csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
 csharp_space_between_method_call_name_and_opening_parenthesis = false
 csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_after_comma = true
-csharp_space_after_dot = false
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_declaration_statements = do_not_ignore
-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_declaration_name_and_open_parenthesis = false
-csharp_space_between_square_brackets = false
-
-# Wrap options
+# Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
 
-## Naming conventions
-[*.{cs,vb}]
+# Namespace settings
+# csharp_style_namespace_declarations = file_scoped
 
-## Naming styles
-
-dotnet_naming_style.pascal_case_style.capitalization = pascal_case
-dotnet_naming_style.camel_case_style.capitalization = camel_case
-
-# PascalCase with I prefix
-dotnet_naming_style.interface_style.capitalization = pascal_case
-dotnet_naming_style.interface_style.required_prefix = I
-
-# PascalCase with T prefix
-dotnet_naming_style.type_parameter_style.capitalization = pascal_case
-dotnet_naming_style.type_parameter_style.required_prefix = T
-
-# camelCase with _ prefix
-dotnet_naming_style._camelCase.capitalization = camel_case
-dotnet_naming_style._camelCase.required_prefix = _
-
-## Rules
-# Interfaces
-dotnet_naming_symbols.interface_symbol.applicable_kinds = interface
-dotnet_naming_symbols.interface_symbol.applicable_accessibilities = *
-dotnet_naming_rule.interface_naming.symbols = interface_symbol
-dotnet_naming_rule.interface_naming.style = interface_style
-dotnet_naming_rule.interface_naming.severity = suggestion
-
-# Classes, Structs, Enums, Properties, Methods, Events, Namespaces
-dotnet_naming_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, event, namespace
-dotnet_naming_symbols.class_symbol.applicable_accessibilities = *
-
-dotnet_naming_rule.class_naming.symbols = class_symbol
-dotnet_naming_rule.class_naming.style = pascal_case_style
-dotnet_naming_rule.class_naming.severity = suggestion
-
-# Type Parameters
-dotnet_naming_symbols.type_parameter_symbol.applicable_kinds = type_parameter
-dotnet_naming_symbols.type_parameter_symbol.applicable_accessibilities = *
-
-dotnet_naming_rule.type_parameter_naming.symbols = type_parameter_symbol
-dotnet_naming_rule.type_parameter_naming.style = type_parameter_style
-dotnet_naming_rule.type_parameter_naming.severity = suggestion
-
-# Private const fields
-dotnet_naming_symbols.const_field_symbol.applicable_kinds = field
-dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = private
-dotnet_naming_symbols.const_field_symbol.required_modifiers = const
-
-dotnet_naming_rule.const_field_naming.symbols = const_field_symbol
-dotnet_naming_rule.const_field_naming.style = _camelCase
-dotnet_naming_rule.const_field_naming.severity = suggestion
-
-# Other const fields
-dotnet_naming_symbols.const_field_symbol.applicable_kinds = field
-dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = *
-dotnet_naming_symbols.const_field_symbol.required_modifiers = const
-
-dotnet_naming_rule.const_field_naming.symbols = const_field_symbol
-dotnet_naming_rule.const_field_naming.style = pascal_case_style
-dotnet_naming_rule.const_field_naming.severity = suggestion
-
-# Public fields
-dotnet_naming_symbols.public_field_symbol.applicable_kinds = field
-dotnet_naming_symbols.public_field_symbol.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
-
-dotnet_naming_rule.public_field_naming.symbols = public_field_symbol
-dotnet_naming_rule.public_field_naming.style = pascal_case_style
-dotnet_naming_rule.public_field_naming.severity = suggestion
-
-# Other fields
-dotnet_naming_symbols.other_field_symbol.applicable_kinds = field
-dotnet_naming_symbols.other_field_symbol.applicable_accessibilities = *
-
-dotnet_naming_rule.other_field_naming.symbols = other_field_symbol
-dotnet_naming_rule.other_field_naming.style = _camelCase
-dotnet_naming_rule.other_field_naming.severity = suggestion
+[*.json]
+indent_size = 2
 
-# Everything Else
-dotnet_naming_symbols.everything_else.applicable_kinds = *
-dotnet_naming_symbols.everything_else.applicable_accessibilities = *
+[*.{ps1,psm1}]
+indent_size = 4
 
-dotnet_naming_rule.everything_else_naming.symbols = everything_else
-dotnet_naming_rule.everything_else_naming.style = camel_case_style
-dotnet_naming_rule.everything_else_naming.severity = suggestion
+[*.sh]
+indent_size = 4
+end_of_line = lf

package.props

@@ -4,9 +4,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <Version>5.1.2</Version>
-    <FileVersion>5.1.2</FileVersion>
-    <AssemblyVersion>5.1.2</AssemblyVersion>
+    <Version>5.1.3</Version>
+    <FileVersion>5.1.3</FileVersion>
+    <AssemblyVersion>5.1.3</AssemblyVersion>
     <Authors>[email protected];</Authors>
     <Copyright>Copyright 2023 Lewis Zou</Copyright>
     <Description>DotnetSpider, a .NET Standard web crawling library. It is lightweight, efficient and fast high-level web crawling &amp; scraping framework</Description>

src/DotnetSpider.Agent/DotnetSpider.Agent.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
   </PropertyGroup>
 
   <Import Project="../../package.props" />
@@ -20,9 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
-    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="4.1.0" />
   </ItemGroup>
 </Project>