Skip to content

Commit

Permalink
set version to 5.0.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
LiorBanai committed Aug 4, 2023
1 parent 87a675f commit 8ec7491
Show file tree
Hide file tree
Showing 8 changed files with 330 additions and 24 deletions.
299 changes: 299 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
# Remove the line below if you want to inherit .editorconfig settings from higher directories
root = true

# C# files
[*.cs]

#### Core EditorConfig Options ####

# Indentation and spacing
indent_size = 4
indent_style = space
tab_width = 4

# New line preferences
end_of_line = crlf
insert_final_newline = false

#### .NET Coding Conventions ####

# Organize usings
dotnet_separate_import_directive_groups = false
dotnet_sort_system_directives_first = false
file_header_template = unset

# this. and Me. preferences
dotnet_style_qualification_for_event = false
dotnet_style_qualification_for_field = false
dotnet_style_qualification_for_method = false
dotnet_style_qualification_for_property = false

# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true
dotnet_style_predefined_type_for_member_access = true

# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity

# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members

# Expression-level preferences
dotnet_style_coalesce_expression = true
dotnet_style_collection_initializer = true
dotnet_style_explicit_tuple_names = true
dotnet_style_namespace_match_folder = true
dotnet_style_null_propagation = true
dotnet_style_object_initializer = true
dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = true
dotnet_style_prefer_compound_assignment = true
dotnet_style_prefer_conditional_expression_over_assignment = true
dotnet_style_prefer_conditional_expression_over_return = true
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
dotnet_style_prefer_inferred_anonymous_type_member_names = true
dotnet_style_prefer_inferred_tuple_names = true
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
dotnet_style_prefer_simplified_boolean_expressions = true
dotnet_style_prefer_simplified_interpolation = true

# Field preferences
dotnet_style_readonly_field = true

# Parameter preferences
dotnet_code_quality_unused_parameters = all

# Suppression preferences
dotnet_remove_unnecessary_suppression_exclusions = none

# New line preferences
dotnet_style_allow_multiple_blank_lines_experimental = true
dotnet_style_allow_statement_immediately_after_block_experimental = true

#### C# Coding Conventions ####

# var preferences
csharp_style_var_elsewhere = false
csharp_style_var_for_built_in_types = false
csharp_style_var_when_type_is_apparent = false

# 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 = true:silent

# Pattern matching preferences
csharp_style_pattern_matching_over_as_with_null_check = true
csharp_style_pattern_matching_over_is_with_cast_check = true
csharp_style_prefer_extended_property_pattern = true
csharp_style_prefer_not_pattern = true
csharp_style_prefer_pattern_matching = true
csharp_style_prefer_switch_expression = true

# Null-checking preferences
csharp_style_conditional_delegate_call = true

# Modifier preferences
csharp_prefer_static_local_function = true
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
csharp_style_prefer_readonly_struct = true
csharp_style_prefer_readonly_struct_member = true

# Code-block preferences
csharp_prefer_braces = true:silent
csharp_prefer_simple_using_statement = true:suggestion
csharp_style_namespace_declarations = block_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent

# Expression-level preferences
csharp_prefer_simple_default_expression = true
csharp_style_deconstructed_variable_declaration = true
csharp_style_implicit_object_creation_when_type_is_apparent = true
csharp_style_inlined_variable_declaration = true
csharp_style_prefer_index_operator = true
csharp_style_prefer_local_over_anonymous_function = true
csharp_style_prefer_null_check_over_type_check = true
csharp_style_prefer_range_operator = true
csharp_style_prefer_tuple_swap = true
csharp_style_prefer_utf8_string_literals = true
csharp_style_throw_expression = true
csharp_style_unused_value_assignment_preference = discard_variable
csharp_style_unused_value_expression_statement_preference = discard_variable

# 'using' directive preferences
csharp_using_directive_placement = outside_namespace:silent

# New line preferences
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent

#### 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 = one_less_than_current
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.property_should_be_pascal_case.severity = error
dotnet_naming_rule.property_should_be_pascal_case.symbols = property
dotnet_naming_rule.property_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.property.applicable_kinds = property
dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.property.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
dotnet_diagnostic.SA1101.severity = silent
dotnet_diagnostic.SA1513.severity = silent
dotnet_diagnostic.SA1600.severity = suggestion
dotnet_diagnostic.SA1508.severity = error
dotnet_diagnostic.SA1128.severity = silent
dotnet_diagnostic.SA1516.severity = silent
dotnet_diagnostic.SA1201.severity = silent
dotnet_diagnostic.MA0004.severity = silent
dotnet_diagnostic.SA1117.severity = silent
dotnet_diagnostic.MA0015.severity = silent
dotnet_diagnostic.MA0026.severity = suggestion
dotnet_diagnostic.SA1202.severity = suggestion
dotnet_diagnostic.SA1116.severity = silent
dotnet_diagnostic.MA0051.severity = silent
dotnet_diagnostic.SA1633.severity = silent
dotnet_diagnostic.SA1005.severity = silent
csharp_style_prefer_primary_constructors = true:suggestion
dotnet_diagnostic.SA1518.severity = error
dotnet_diagnostic.SA1001.severity = error
dotnet_diagnostic.SA1507.severity = error
dotnet_diagnostic.SA1505.severity = error
dotnet_diagnostic.SA1400.severity = error
dotnet_diagnostic.SA1503.severity = error
dotnet_diagnostic.SA1515.severity = error
dotnet_diagnostic.SA1514.severity = error
dotnet_diagnostic.SA1413.severity = error
dotnet_diagnostic.SA1008.severity = error
dotnet_diagnostic.SA1121.severity = error
dotnet_diagnostic.SA1212.severity = error
dotnet_diagnostic.SA1313.severity = error
dotnet_diagnostic.CA1805.severity = error
dotnet_diagnostic.MA0134.severity = error
dotnet_diagnostic.SA1408.severity = error
dotnet_diagnostic.SA1210.severity = error
dotnet_diagnostic.SA1122.severity = suggestion
dotnet_diagnostic.SA1108.severity = silent
dotnet_diagnostic.SA1012.severity = error
dotnet_diagnostic.SA1500.severity = error

[*.{cs,vb}]
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
indent_size = 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_collection_initializer = true:suggestion
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
dotnet_diagnostic.CA1854.severity = error
dotnet_diagnostic.CA1707.severity = error
dotnet_diagnostic.CA2208.severity = error
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_code_quality_unused_parameters = all:suggestion
dotnet_diagnostic.CA2200.severity = error
dotnet_diagnostic.CA1012.severity = error
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@
<PackageReleaseNotes>update API</PackageReleaseNotes>
<PackageIcon>AnalogyWindows.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>3.8.3</Version>
<VersionPrefix>5.0.0.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Company>Analogy.LogViewer</Company>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="3.8.3" />
<PackageReference Include="Analogy.LogViewer.Template" Version="3.8.3" />
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="5.0.0" />
<PackageReference Include="Analogy.LogViewer.Template" Version="5.0.0" />
<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
3 changes: 2 additions & 1 deletion Analogy.LogViewer.WindowsEventLogs/EventViewerLogLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Analogy.Interfaces.DataTypes;
using Analogy.LogViewer.Template.Managers;
using Analogy.LogViewer.WindowsEventLogs.Managers;
using Microsoft.Extensions.Logging;

namespace Analogy.LogViewer.WindowsEventLogs
{
Expand Down Expand Up @@ -170,7 +171,7 @@ public async Task<IEnumerable<IAnalogyLogMessage>> ReadFromFile(string fileName,
Class = AnalogyLogClass.General,
Source = "Analogy"
};
LogManager.Instance.LogException($"Error reading file:{e.Message}",e, nameof(ReadFromFile));
LogManager.Instance.LogError(e, $"Error reading file:{e.Message}",e, nameof(ReadFromFile));
messages.Add(m);
messagesHandler.AppendMessages(messages, GetFileNameAsDataSource(fileName));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Analogy.Interfaces.Factories;
using Analogy.LogViewer.Template;
using Analogy.LogViewer.Template.Managers;
using Microsoft.Extensions.Logging;

namespace Analogy.LogViewer.WindowsEventLogs.IAnalogy
{
Expand Down Expand Up @@ -46,10 +47,10 @@ public class WindowsEventLogFile : IAnalogySingleFileDataProvider
public virtual IEnumerable<string> HideAdditionalColumns() => Enumerable.Empty<string>();

public Guid Id { get; set; }
public Image? LargeImage { get; set; } = null;
public Image? SmallImage { get; set; } = null;
public Image? LargeImage { get; set; }
public Image? SmallImage { get; set; }
public string OptionalTitle { get; set; }
public bool UseCustomColors { get; set; } = false;
public bool UseCustomColors { get; set; }
public AnalogyToolTip? ToolTip { get; set; }

public IEnumerable<(string originalHeader, string replacementHeader)> GetReplacementHeaders()
Expand All @@ -64,7 +65,7 @@ public WindowsEventLogFile(string fileNamePath, Guid id)
Id = id;
OptionalTitle = Path.GetFileName(FileNamePath);
}
public Task InitializeDataProvider(IAnalogyLogger logger)
public Task InitializeDataProvider(ILogger logger)
{
LogManager.Instance.SetLogger(logger);
return Task.CompletedTask;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Analogy.Interfaces;
using Analogy.LogViewer.Template;
using Analogy.LogViewer.WindowsEventLogs.Managers;
using Microsoft.Extensions.Logging;

namespace Analogy.LogViewer.WindowsEventLogs.IAnalogy
{
Expand All @@ -17,7 +18,7 @@ public class EventLogsDataProviderSettings : TemplateUserSettingsFactory
public override Guid FactoryId { get; set; } = EventLogPrimaryFactory.id;
public override Guid Id { get; set; } = new Guid("61774F7C-4F62-4A61-AD24-FC8263DF518A");

public override void CreateUserControl(IAnalogyLogger logger)
public override void CreateUserControl(ILogger logger)
{
DataProviderSettings = new EventLogsSettings();
}
Expand Down
Loading

0 comments on commit 8ec7491

Please sign in to comment.