Skip to content

Commit 36b6bea

Browse files
authored
Merge pull request #1 from serilog/dev
Sync to base
2 parents 41f65c7 + 4dc7030 commit 36b6bea

File tree

123 files changed

+7695
-1638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+7695
-1638
lines changed

.editorconfig

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,72 @@
11
root = true
22

33
[*]
4-
trim_trailing_whitespace = true
5-
insert_final_newline = true
6-
indent_style = space
74
indent_size = 4
5+
indent_style = space
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
88

99
[*.{csproj,json,config,yml}]
1010
indent_size = 2
1111

1212
[*.sh]
1313
end_of_line = lf
1414

15-
[*.{cmd, bat}]
15+
[*.{cmd,bat}]
1616
end_of_line = crlf
17+
18+
[*.cs]
19+
csharp_indent_case_contents = true
20+
csharp_indent_case_contents_when_block = true
21+
csharp_indent_labels = flush_left
22+
csharp_indent_switch_labels = true
23+
csharp_new_line_before_catch = true
24+
csharp_new_line_before_else = true
25+
csharp_new_line_before_finally = true
26+
csharp_new_line_before_members_in_anonymous_types = true
27+
csharp_new_line_before_members_in_object_initializers = true
28+
csharp_new_line_before_open_brace = all
29+
csharp_new_line_between_query_expression_clauses = true
30+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:error
31+
csharp_prefer_braces = true:silent
32+
csharp_prefer_simple_default_expression = true:suggestion
33+
csharp_style_deconstructed_variable_declaration = true:suggestion
34+
csharp_preserve_single_line_blocks = true
35+
csharp_preserve_single_line_statements = true
36+
csharp_space_after_cast = false
37+
csharp_space_after_colon_in_inheritance_clause = true
38+
csharp_space_after_keywords_in_control_flow_statements = true
39+
csharp_space_around_binary_operators = before_and_after
40+
csharp_space_before_colon_in_inheritance_clause = true
41+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
42+
csharp_space_between_method_call_name_and_opening_parenthesis = false
43+
csharp_space_between_method_call_parameter_list_parentheses = false
44+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
45+
csharp_space_between_method_declaration_parameter_list_parentheses = false
46+
csharp_space_between_parentheses = false
47+
csharp_style_conditional_delegate_call = true:suggestion
48+
csharp_style_expression_bodied_accessors = true:silent
49+
csharp_style_expression_bodied_constructors = false:silent
50+
csharp_style_expression_bodied_indexers = true:silent
51+
csharp_style_expression_bodied_methods = false:silent
52+
csharp_style_expression_bodied_operators = false:silent
53+
csharp_style_expression_bodied_properties = true:silent
54+
csharp_style_inlined_variable_declaration = true:suggestion
55+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
56+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
57+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
58+
csharp_style_throw_expression = true:suggestion
59+
csharp_style_var_elsewhere = true:silent
60+
csharp_style_var_for_built_in_types = true:warning
61+
csharp_style_var_when_type_is_apparent = true:warning
62+
csharp_using_directive_placement = outside_namespace:warning
63+
64+
dotnet_naming_rule.private_members_with_underscore.symbols = private_fields
65+
dotnet_naming_rule.private_members_with_underscore.style = prefix_underscore
66+
dotnet_naming_rule.private_members_with_underscore.severity = error
67+
dotnet_naming_symbols.private_fields.applicable_kinds = field
68+
dotnet_naming_symbols.private_fields.applicable_accessibilities = private,protected
69+
dotnet_naming_style.prefix_underscore.capitalization = camel_case
70+
dotnet_naming_style.prefix_underscore.required_prefix = _
71+
dotnet_sort_system_directives_first = true
72+
dotnet_style_require_accessibility_modifiers = always:error

CHANGES.md

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,58 @@
1-
5.2
1+
# 5.3.0
2+
Code quality release.
3+
* Added code analysis and editorconfig rules based on Microsoft standards.
4+
* Fixed code analysis errors where possible and added justified suppressions the few remainig.
5+
* Use Visual Studio 2019 for AppVeyor builds
6+
* Updated some dependencies.
7+
* Added CombinedConfigDemo sample program showing how to combine config and code based sink intitialization.
8+
* Added a lot of unit tests.
9+
10+
# 5.2.0
11+
* Enhancement #232: Allow to override formatter for rendering LogEvent column.
12+
* Fixed #187 (again - still an exception when using logevent column with TimeStamp column type DateTimeOffset).
13+
* Added sample programs
14+
15+
# 5.1.4
16+
* Fixed #187 Support datetimeoffset as a column type for default column TimeStamp.
17+
* Fixed #229 Slight issue with documentation.
18+
19+
# 5.1.3
20+
* Support binary data type, support specify data length in column config, support specify allow null column
21+
* Also build on unit-test commits
22+
* Added issue templase
23+
* Hybrid config implementation
24+
* Bugfixes
25+
26+
# 5.1.2
227
* Support for Audit sink added (#118/#110).
328

4-
4.0.0
29+
# 4.0.0
530
* Serilog 2.0
631
* [Documentation fix](https://github.com/serilog/serilog-sinks-mssqlserver/pull/32)
732

8-
2.0.33
33+
# 2.0.33
934
* Option added to exclude redundant properties from serialized JSON in column LogEvent. (https://github.com/serilog/serilog-sinks-mssqlserver/pull/27)
1035

11-
2.0.32
36+
# 2.0.32
1237
* Safe conversion of data types. Also included selflog for bulk operation errors. (https://github.com/serilog/serilog-sinks-mssqlserver/pull/4)
1338

14-
2.0.31
39+
# 2.0.31
1540
* Added the ability to configure additional columns via XML configuration (https://github.com/serilog/serilog-sinks-mssqlserver/pull/6)
1641

17-
2.0.30
42+
# 2.0.30
1843
* You can optionally save the log event inside the database too. Also added ability to exclude the properties if they are saved already inside additional columns. (https://github.com/serilog/serilog-sinks-mssqlserver/pull/7)
1944

20-
2.0.28
45+
# 2.0.28
2146
* Added explicit column mappings (https://github.com/serilog/serilog-sinks-mssqlserver/pull/10)
2247

23-
2.0.27
48+
# 2.0.27
2449
* Option added to automatically create a database table (by Kiran Varsani (https://github.com/varsanikp))
2550

26-
2.0.13
51+
# 2.0.13
2752
* Ability to add additional properties as columns in the database
2853

29-
2.0.1
54+
# 2.0.1
3055
* Option to [write times in UTC](https://github.com/serilog/serilog-sinks-mssqlserver/pull/1)
3156

32-
1.5
57+
# 1.5
3358
* Moved from serilog/serilog

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of Conduct
2+
3+
Please refer to the [Serilog Code of Conduct](https://github.com/serilog/serilog/blob/dev/CODE_OF_CONDUCT.md) which covers all repositories within the Serilog Organization.

0 commit comments

Comments
 (0)