Skip to content
This repository has been archived by the owner on Jun 1, 2024. It is now read-only.

Create v9.0.0 #509

Merged
merged 67 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
6cafc3e
Create codeql-analysis.yml (#370)
mivano Nov 12, 2020
f14e29f
fix: Correct comment about default TypeName (#393)
mikkelbu Jul 1, 2021
7591772
Proper handling of TypeName = null from appsettings.json (#420)
mariwing Apr 29, 2022
b5bd109
Add `ElasticsearchSinkOptions.BufferFileRollingInterval` option (#416)
andrey-kozlov-skuvault Apr 29, 2022
7c512cc
Fix internal or IntelliSense typos (#406)
boflynn Apr 29, 2022
8f0b27b
Clean package sources
mivano Apr 29, 2022
dc2d734
clean obsolete .net versions
mivano Apr 29, 2022
e9649e3
updated packages
mivano Apr 29, 2022
7dcaa5a
added dependabot
mivano Apr 29, 2022
114f59d
Bump actions/setup-dotnet from 1 to 2 (#431)
dependabot[bot] Apr 29, 2022
53f6a6b
Bump actions/checkout from 2 to 3 (#427)
dependabot[bot] Apr 29, 2022
ed7d983
Bump actions/cache from 2 to 3 (#429)
dependabot[bot] Apr 29, 2022
d638ac1
Bump actions/download-artifact from 2 to 3 (#424)
dependabot[bot] Apr 29, 2022
20fcd81
added dependencies
mivano Apr 29, 2022
1ac278d
Merge branch 'dev' of https://github.com/serilog/serilog-sinks-elasti…
mivano Apr 29, 2022
c951c92
copy local files
mivano Apr 29, 2022
dbb7624
updating versions
mivano Apr 29, 2022
4f1e353
publish test results
mivano Apr 29, 2022
faf813f
remove old nuspec and updated icons
mivano Apr 29, 2022
6e1cc47
added icon
mivano Apr 29, 2022
d7de8b8
updates
mivano Apr 29, 2022
ecfd2b9
fix build
mivano Apr 29, 2022
a45a98d
multiple packages
mivano Apr 29, 2022
141c21a
name
mivano Apr 29, 2022
1916b6b
cicd
mivano Apr 29, 2022
b967716
skip test for now as it is flaky
mivano Apr 29, 2022
3700cb4
version
mivano Apr 29, 2022
d733ecf
Names
mivano Apr 29, 2022
22ddb0e
use correct folder
mivano Apr 29, 2022
0aeab2d
older version
mivano Apr 29, 2022
ba68ca9
diffferent way of pushing
mivano Apr 29, 2022
5f0414b
enviroment
mivano Apr 29, 2022
d3ac2de
Remove app veyor and dotnet-version
mivano Apr 29, 2022
2a693fd
Use repo owner
mivano Apr 29, 2022
2ffc98e
use dotnet nuget
mivano Apr 29, 2022
5e99222
logging
mivano Apr 29, 2022
b5bcaf8
remove @
mivano Apr 29, 2022
5134e32
--skip-duplicate
mivano Apr 29, 2022
875d89a
update project url
mivano Apr 29, 2022
d7328c6
Updated changelog
mivano Apr 29, 2022
332280c
paths
mivano Apr 29, 2022
991470d
use correct output path
mivano Apr 29, 2022
bb7b377
remove the source
mivano Apr 29, 2022
f310316
skip duplicates
mivano May 8, 2022
961680d
Bump actions/setup-dotnet from 2 to 3.0.2 (#478)
dependabot[bot] Jan 9, 2023
4b7e4a7
Update cicd.yaml
mivano Jan 9, 2023
f548853
Bump actions/download-artifact from 1 to 3 (#439)
dependabot[bot] Jan 9, 2023
2ec3c64
Bump actions/upload-artifact from 2 to 3 (#438)
dependabot[bot] Jan 9, 2023
5fa9b0c
Update cicd.yaml
mivano Jan 9, 2023
4f27900
fix file references in the Visual Studio Solution file. (#461)
nenadvicentic Jan 16, 2023
9655ca2
Bump actions/setup-dotnet from 3.0.2 to 3.0.3 (#487)
dependabot[bot] Jan 16, 2023
306a3aa
Bump github/codeql-action from 1 to 2 (#426)
dependabot[bot] Jan 16, 2023
fa5b097
Automatically handle `TypeName` parameter for different versions of E…
nenadvicentic Jan 23, 2023
78c3030
Update dotnet sdk
mivano Jan 23, 2023
cd2f399
disable net48 tests
mivano Jan 23, 2023
5b9795f
set api key
mivano Jan 23, 2023
3d1dce0
Remove support for Elasticsearch v2 and v5. (#488)
nenadvicentic Jan 24, 2023
a473d1d
added path for tests
mivano Jan 24, 2023
e3876b1
fix: Example in README is incorrect #402 (#496)
nenadvicentic Jan 25, 2023
09e2d5e
Applying right versioning
mivano Jan 26, 2023
c71b664
Update AssemblyInfo.cs
mivano Jan 26, 2023
578d5cb
Remove `AssemblyInfo.cs` and move attributes to the `*.csproj` file. …
nenadvicentic Jan 28, 2023
a537c60
Read Elasticsearch server version from a root page response (#502)
nenadvicentic Jan 28, 2023
75e1230
Versioning and permission for unit tests
mivano Jan 28, 2023
9a75528
[no ci]
mivano Jan 29, 2023
5c6985c
#498 Disable `PublicSign` to fix strong-name signature verification i…
nenadvicentic Jan 30, 2023
5fce1f3
[no ci]
mivano Jan 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,19 @@ indent_size = 4

[*.csproj]
indent_size = 2

# Code files
[*.{cs,csx,vb,vbx}]
###############################
# Naming Conventions #
###############################
# Underscore for private fields
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 = _
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "nuget"
directory: "/" # Location of package manifests
schedule:
interval: "daily"

- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
schedule:
interval: "daily"
150 changes: 150 additions & 0 deletions .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
name: Continuous Integration

on:
push:
pull_request:
release:
types:
- published
env:
Configuration: Release
ContinuousIntegrationBuild: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_NOLOGO: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

# GitHub Packages Feed settings
GITHUB_FEED: https://nuget.pkg.github.com/serilog-contrib/
GITHUB_USER: mivano
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
package:
runs-on: ubuntu-latest
name: Run tests and create NuGet package
outputs:
coverage-reports: ${{ steps.dotnet-test.outputs.coverage-reports }}
version: ${{ steps.dotnet-pack.outputs.version }}
nupkg-filename: ${{ steps.dotnet-pack.outputs.nupkg-filename }}
release-body: ${{ steps.tag-message.outputs.release-notes }}
steps:
- name: Checkout git repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install .NET SDK
uses: actions/[email protected]
with:
dotnet-version: '7.0.x'

- name: Retrieve cached NuGet packages
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

- name: Restore NuGet packages
run: dotnet restore

- name: Build solution
run: dotnet build --no-restore -c Release

- name: Run tests
run: dotnet test --no-build -c Release --logger "html;LogFileName=TestResults-${{ runner.os }}.html" --logger "trx;LogFileName=TestResults-${{ runner.os }}.trx" --logger GitHubActions
id: dotnet-test

- name: Upload received files from failing tests
uses: actions/upload-artifact@v3
if: failure()
with:
name: Received-${{ runner.os }}
path: "**/*.received.*"

- name: Upload test results
uses: actions/upload-artifact@v3
if: always()
with:
name: TestResults-${{ runner.os }}
path: test/Serilog.Sinks.Elasticsearch.Tests/TestResults/TestResults-${{ runner.os }}.html

- name: Test Report
uses: dorny/test-reporter@v1
if: always()
with:
name: Test Results (${{ runner.os }})
path: '**.trx'
reporter: dotnet-trx

- name: Create NuGet packages
run: dotnet pack --no-build -c Release --version-suffix "ci-$GITHUB_RUN_ID" --include-symbols --include-source --output .
id: dotnet-pack

- name: Upload NuGet package artifact
uses: actions/upload-artifact@v3
with:
name: nuget
path: '**/*.nupkg'

prerelease:
needs: package
name: Create prerelease
if: github.ref == 'refs/heads/dev'
runs-on: ubuntu-latest
steps:
- name: Download Artifact
uses: actions/download-artifact@v3
with:
name: nuget
path: nuget
- name: Push to GitHub Feed
run: |
dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/serilog-contrib/index.json"

for f in ./nuget/*.nupkg
do
echo $f
dotnet nuget push $f --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
done

publish:
runs-on: ubuntu-latest
needs: package
if: github.event_name == 'release'
name: Publish NuGet package
steps:
- name: Checkout git repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install .NET SDK
uses: actions/[email protected]

- name: Retrieve cached NuGet packages
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

- name: Restore NuGet packages
run: dotnet restore

- name: Create Release NuGet package
run: |
arrTag=(${GITHUB_REF//\// })
VERSION="${arrTag[2]}"
VERSION="${VERSION//v}"
dotnet pack -v normal -c Release --include-symbols --include-source -p:Version=$VERSION -o ./nuget

- name: Push to GitHub Feed
run: |
dotnet nuget add source --username $GITHUB_USER --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/serilog-contrib/index.json"

for f in ./nuget/*.nupkg
do
dotnet nuget push $f --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
done

- name: Publish NuGet package on nuget.org
run: dotnet nuget push ./nuget/*.nupkg --api-key "${{ secrets.NUGET_API_KEY }}" --skip-duplicate
73 changes: 73 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
# ******** NOTE ********

name: "CodeQL"

on:
push:
branches: [ dev, master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ dev ]
schedule:
- cron: '27 7 * * 6'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: [ 'csharp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup dotnet
uses: actions/[email protected]
with:
dotnet-version: '6.0.x'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
15 changes: 10 additions & 5 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
{
"version": "0.1.0",
"version": "2.0.0",
"command": "dotnet",
"isShellCommand": true,
"args": [],
"tasks": [
{
"taskName": "build",
"label": "build",
"type": "shell",
"command": "dotnet",
"args": [
"build",
"${workspaceRoot}/sample/Serilog.Sinks.Elasticsearch.Sample/Serilog.Sinks.Elasticsearch.Sample.csproj"
],
"isBuildCommand": true,
"problemMatcher": "$msCompile"
"problemMatcher": "$msCompile",
"group": {
"_id": "build",
"isDefault": false
}
}
]
}
16 changes: 16 additions & 0 deletions .vscode/tasks.json.old
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.0",
"command": "dotnet",
"isShellCommand": true,
"args": [],
"tasks": [
{
"taskName": "build",
"args": [
"${workspaceRoot}/sample/Serilog.Sinks.Elasticsearch.Sample/Serilog.Sinks.Elasticsearch.Sample.csproj"
],
"isBuildCommand": true,
"problemMatcher": "$msCompile"
}
]
}
52 changes: 0 additions & 52 deletions Build.ps1

This file was deleted.

Loading