Skip to content

Commit fdecaea

Browse files
EEParkerdependabot[bot]merblaEngRajabiHavagan
authored
4.0.0 Release (#178)
* Bump System.Net.Http from 4.3.3 to 4.3.4 in /sample/Sample Bumps System.Net.Http from 4.3.3 to 4.3.4. Signed-off-by: dependabot[bot] <support@github.com> * Bump System.Net.Http from 4.3.0 to 4.3.4 in /src/Serilog.Sinks.Splunk Bumps System.Net.Http from 4.3.0 to 4.3.4. Signed-off-by: dependabot[bot] <support@github.com> * Bump System.Net.Http in /test/Serilog.Sinks.Splunk.Tests Bumps System.Net.Http from 4.3.3 to 4.3.4. Signed-off-by: dependabot[bot] <support@github.com> * Bump System.Net.Http from 4.3.0 to 4.3.4 in /src/Serilog.Sinks.UDP Bumps System.Net.Http from 4.3.0 to 4.3.4. Signed-off-by: dependabot[bot] <support@github.com> * add default batch config * Update expired GitHub Key * add default batch config * Update expired GitHub Key * fix bug dispose (#153) * Regenerate API Key for NuGet * Splunk 9.1 + .NET 6 (#166) * Sample: Target net6.0. Added additional logging statements. * Docker: Splunk 9.1. * Tests: Target net6.0 and updated nuget packages. * Added constant for services/collector. Event request trims / from uri. Updated collector URL for Splunk 9.1 * Update to serilog periodic batching 4.x (#168) * Updated dependencies to Serilog 3.1 and Periodic Batching Sink to 4.0.0 * Update version to 4.0.0 due to the breaking constructor changes on the EventCollectorSink * Update Dockerfile with net6.0 versions * Use the latest version of Splunk The 7.2 label does not appear to be available anymore. * Add in missing build for net6.0 * Use forward slash for ignore This should work on Windows as well * Use the same Framework reference for the sample Everything else is using at least net6.0 so the Sample should as well --------- Co-authored-by: Justin Pfifer <justin.pfifer@carvana.com> Co-authored-by: Jeff Parker, PE <EEParker@users.noreply.github.com> * dotnet 8.0 updates (#171) * Feature/161 subsecond decimals (#172) * Fixes #161 add subsecond decimal configuration * Fixes #167 Add a flag for RenderedMessage * Update SubSecondPrecision to use an enum. Based on 3,6,9 decimals, see https://docs.splunk.com/Documentation/Splunk/9.2.0/SearchReference/Commontimeformatvariables * Add unit tests and update documentation * Invert renderMessage check * Update sample docker-compose project - add new tests - add a docker-compose vscode project - allow subsecond precision. * Add comment for configuring splunk * Fix formatting for nanoseconds * Enable all tests in sample app --------- Co-authored-by: Victorio Berra <toryberra@gmail.com> * Set up GitHub Actions (#174) * Enable GitHub Actions * Main branch is called master in this repo * Ignore .idea * No need to offset builds by 200 * work on build for new project format * add automatic release notes --------- Co-authored-by: EEParker <EEParker@users.noreply.github.com> * Filter branches that push to nuget (#177) * Security Policy, scanning and dependency updates (#176) * Add dependabot configuration * Add codeql * Add security policy * Update dependabot.yml add newline * update branches * Update SECURITY.md * Readme and package license fix * Update dotnet pack command line --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthew Erbs <matthew.erbs@merbla.com> Co-authored-by: Mohsen Rajabi <m.kabir8895@gmail.com> Co-authored-by: Havagan <Havagan@users.noreply.github.com> Co-authored-by: Justin Pfifer <61801015+jpfifer@users.noreply.github.com> Co-authored-by: Justin Pfifer <justin.pfifer@carvana.com> Co-authored-by: Victorio Berra <toryberra@gmail.com> Co-authored-by: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
1 parent 80b91cd commit fdecaea

Some content is hidden

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

46 files changed

+1178
-368
lines changed

‎.dockerignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
bin\
2-
obj\
1+
bin/
2+
obj/

‎.editorconfig‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
indent_style = space
8+
trim_trailing_whitespace = true
9+
10+
[Caddyfile]
11+
indent_size = tab
12+
13+
# XML project files
14+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,dcproj}]
15+
indent_size = 2
16+
17+
# XML config files
18+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
19+
indent_size = 2
20+
21+
# JSON config files
22+
[*.{json,jsonc}]
23+
indent_size = 2
24+
insert_final_newline = true
25+
26+
# YAML config files
27+
[*.{yml,yaml}]
28+
indent_size = 2
29+
insert_final_newline = true
30+
31+
# Code files
32+
[*.{cs,csx,vb,vbx}]
33+
indent_size = 4
34+
insert_final_newline = true
35+
charset = utf-8-bom
36+
37+
# Markdown
38+
[*.{md, mmd}]
39+
indent_size = 4
40+
insert_final_newline = true
41+
trim_trailing_whitespace = false
42+
43+
###############################
44+
# .NET Coding Conventions #
45+
###############################
46+
[*.{cs,vb}]
47+
# Instance fields are camelCase and start with _
48+
dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
49+
dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
50+
dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
51+
dotnet_naming_symbols.instance_fields.applicable_kinds = field
52+
dotnet_naming_style.instance_field_style.capitalization = camel_case
53+
dotnet_naming_style.instance_field_style.required_prefix = _
54+
# Organize usings
55+
dotnet_sort_system_directives_first = true
56+
# this. preferences
57+
dotnet_style_qualification_for_field = false:silent
58+
dotnet_style_qualification_for_property = false:silent
59+
dotnet_style_qualification_for_method = false:silent
60+
dotnet_style_qualification_for_event = false:silent
61+
# Language keywords vs BCL types preferences
62+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
63+
dotnet_style_predefined_type_for_member_access = true:silent
64+
# Parentheses preferences
65+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
66+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
67+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
68+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
69+
# Modifier preferences
70+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
71+
dotnet_style_readonly_field = true:suggestion
72+
# Expression-level preferences
73+
dotnet_style_object_initializer = true:suggestion
74+
dotnet_style_collection_initializer = true:suggestion
75+
dotnet_style_explicit_tuple_names = true:suggestion
76+
dotnet_style_null_propagation = true:suggestion
77+
dotnet_style_coalesce_expression = true:suggestion
78+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
79+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
80+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
81+
dotnet_style_prefer_auto_properties = true:silent
82+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
83+
dotnet_style_prefer_conditional_expression_over_return = true:silent
84+
###############################
85+
# Naming Conventions #
86+
###############################
87+
# Style Definitions
88+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
89+
# Use PascalCase for constant fields
90+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
91+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
92+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
93+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
94+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
95+
dotnet_naming_symbols.constant_fields.required_modifiers = const
96+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
97+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
98+
tab_width = 4
99+
end_of_line = crlf
100+
dotnet_style_prefer_compound_assignment = true:suggestion
101+
dotnet_style_prefer_simplified_interpolation = true:suggestion
102+
dotnet_style_namespace_match_folder = true:suggestion
103+
dotnet_style_prefer_collection_expression = true:suggestion
104+
###############################
105+
# C# Coding Conventions #
106+
###############################
107+
[*.cs]
108+
# var preferences
109+
csharp_style_var_for_built_in_types = true:silent
110+
csharp_style_var_when_type_is_apparent = true:silent
111+
csharp_style_var_elsewhere = true:silent
112+
# Expression-bodied members
113+
csharp_style_expression_bodied_methods = false:silent
114+
csharp_style_expression_bodied_constructors = false:silent
115+
csharp_style_expression_bodied_operators = false:silent
116+
csharp_style_expression_bodied_properties = true:silent
117+
csharp_style_expression_bodied_indexers = true:silent
118+
csharp_style_expression_bodied_accessors = true:silent
119+
# Pattern matching preferences
120+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
121+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
122+
# Null-checking preferences
123+
csharp_style_throw_expression = true:suggestion
124+
csharp_style_conditional_delegate_call = true:suggestion
125+
# Modifier preferences
126+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
127+
# Expression-level preferences
128+
csharp_prefer_braces = true:silent
129+
csharp_style_deconstructed_variable_declaration = true:suggestion
130+
csharp_prefer_simple_default_expression = true:suggestion
131+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
132+
csharp_style_inlined_variable_declaration = true:suggestion
133+
###############################
134+
# C# Formatting Rules #
135+
###############################
136+
# New line preferences
137+
csharp_new_line_before_open_brace = all
138+
csharp_new_line_before_else = true
139+
csharp_new_line_before_catch = true
140+
csharp_new_line_before_finally = true
141+
csharp_new_line_before_members_in_object_initializers = true
142+
csharp_new_line_before_members_in_anonymous_types = true
143+
csharp_new_line_between_query_expression_clauses = true
144+
# Indentation preferences
145+
csharp_indent_case_contents = true
146+
csharp_indent_switch_labels = true
147+
csharp_indent_labels = flush_left
148+
# Space preferences
149+
csharp_space_after_cast = false
150+
csharp_space_after_keywords_in_control_flow_statements = true
151+
csharp_space_between_method_call_parameter_list_parentheses = false
152+
csharp_space_between_method_declaration_parameter_list_parentheses = false
153+
csharp_space_between_parentheses = false
154+
csharp_space_before_colon_in_inheritance_clause = true
155+
csharp_space_after_colon_in_inheritance_clause = true
156+
csharp_space_around_binary_operators = before_and_after
157+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
158+
csharp_space_between_method_call_name_and_opening_parenthesis = false
159+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
160+
# Wrapping preferences
161+
csharp_preserve_single_line_statements = true
162+
csharp_preserve_single_line_blocks = true
163+
csharp_using_directive_placement = outside_namespace:suggestion
164+
csharp_prefer_simple_using_statement = true:suggestion
165+
csharp_style_namespace_declarations = file_scoped:suggestion
166+
csharp_style_expression_bodied_lambdas = true:silent
167+
csharp_style_expression_bodied_local_functions = true:silent
168+
csharp_style_prefer_null_check_over_type_check = true:suggestion
169+
csharp_style_prefer_method_group_conversion = true:silent
170+
csharp_style_prefer_top_level_statements = true:silent
171+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
172+
csharp_style_prefer_index_operator = true:suggestion
173+
csharp_style_prefer_range_operator = true:suggestion
174+
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
175+
csharp_style_prefer_primary_constructors = true:suggestion
176+
###############################
177+
# VB Coding Conventions #
178+
###############################
179+
[*.vb]
180+
# Modifier preferences
181+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
- package-ecosystem: "nuget"
9+
directory: "/"
10+
schedule:
11+
interval: "daily"

‎.github/release.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# .github/release.yml
2+
3+
changelog:
4+
exclude:
5+
labels:
6+
- ignore-for-release
7+
authors:
8+
- octocat
9+
categories:
10+
- title: Breaking Changes 🛠
11+
labels:
12+
- Semver-Beta
13+
- title: Major Update 🛸
14+
labels:
15+
- Semver-Major
16+
- Feature
17+
- title: New Features 🎉
18+
labels:
19+
- Semver-Minor
20+
- enhancement
21+
- title: Dependencies 👒
22+
labels:
23+
- dependencies
24+
- title: Bugfixes 🐛
25+
labels:
26+
- Semver-Patch
27+
- bug
28+
- title: Other Changes
29+
labels:
30+
- "*"

‎.github/workflows/ci-release.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# If this file is renamed, the incrementing run attempt number will be reset.
2+
3+
name: CI
4+
5+
on:
6+
push:
7+
tags:
8+
- '*'
9+
10+
env:
11+
CI_BUILD_NUMBER: ${{ github.run_number }}
12+
CI_TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
13+
CI_COMMIT_TAG: ${{ github.ref_name }}
14+
15+
jobs:
16+
build:
17+
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
- name: Setup
23+
uses: actions/setup-dotnet@v4
24+
with:
25+
dotnet-version: 8.0.x
26+
- name: Build and Publish
27+
env:
28+
DOTNET_CLI_TELEMETRY_OPTOUT: true
29+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
30+
shell: pwsh
31+
run: |
32+
./Build.ps1
33+
- name: Create Release
34+
uses: ncipollo/release-action@v1
35+
with:
36+
artifacts: "artifacts/*.nupkg"
37+
generateReleaseNotes: true

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# If this file is renamed, the incrementing run attempt number will be reset.
2+
3+
name: CI
4+
5+
on:
6+
push:
7+
branches: [ "dev", "master" ]
8+
pull_request:
9+
branches: [ "dev", "master" ]
10+
11+
env:
12+
CI_BUILD_NUMBER: ${{ github.run_number }}
13+
CI_TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
14+
#CI_COMMIT_TAG: ""
15+
16+
jobs:
17+
build:
18+
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
- name: Setup
24+
uses: actions/setup-dotnet@v4
25+
with:
26+
dotnet-version: 8.0.x
27+
- name: Build and Publish
28+
env:
29+
DOTNET_CLI_TELEMETRY_OPTOUT: true
30+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
31+
shell: pwsh
32+
run: |
33+
./Build.ps1

‎.github/workflows/codeql.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "dev", "master", "main" ]
6+
pull_request:
7+
branches: [ "dev", "master", "main" ]
8+
schedule:
9+
- cron: '16 12 * * 6'
10+
11+
jobs:
12+
analyze:
13+
name: Analyze (${{ matrix.language }})
14+
# Runner size impacts CodeQL analysis time. To learn more, please see:
15+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
16+
# - https://gh.io/supported-runners-and-hardware-resources
17+
# - https://gh.io/using-larger-runners
18+
# Consider using larger runners for possible analysis time improvements.
19+
runs-on: 'ubuntu-latest'
20+
timeout-minutes: 360
21+
permissions:
22+
# required for all workflows
23+
security-events: write
24+
# only required for workflows in private repositories
25+
actions: read
26+
contents: read
27+
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
include:
32+
- language: csharp
33+
build-mode: autobuild
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v4
37+
38+
# Initializes the CodeQL tools for scanning.
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@v3
41+
with:
42+
languages: ${{ matrix.language }}
43+
build-mode: ${{ matrix.build-mode }}
44+
45+
- name: Perform CodeQL Analysis
46+
uses: github/codeql-action/analyze@v3
47+
with:
48+
category: "/language:${{matrix.language}}"

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,5 @@ _Pvt_Extensions
239239

240240
sample/Sample/out/
241241

242-
.DS_Store
242+
.DS_Store
243+
.idea

0 commit comments

Comments
 (0)