serilog-contrib
diff --git a/‎.editorconfig
Lines changed: 16 additions & 0 deletions b/‎.editorconfig
Lines changed: 16 additions & 0 deletions
diff --git a/‎.github/dependabot.yml
Lines changed: 16 additions & 0 deletions b/‎.github/dependabot.yml
Lines changed: 16 additions & 0 deletions
diff --git a/‎.github/workflows/cicd.yaml
Lines changed: 150 additions & 0 deletions b/‎.github/workflows/cicd.yaml
Lines changed: 150 additions & 0 deletions
diff --git a/‎.github/workflows/codeql-analysis.yml
Lines changed: 73 additions & 0 deletions b/‎.github/workflows/codeql-analysis.yml
Lines changed: 73 additions & 0 deletions
diff --git a/‎.vscode/tasks.json
Lines changed: 10 additions & 5 deletions b/‎.vscode/tasks.json
Lines changed: 10 additions & 5 deletions
diff --git a/‎.vscode/tasks.json.old
Lines changed: 16 additions & 0 deletions b/‎.vscode/tasks.json.old
Lines changed: 16 additions & 0 deletions
diff --git a/‎Build.ps1
Lines changed: 0 additions & 52 deletions b/‎Build.ps1
Lines changed: 0 additions & 52 deletions
@@ -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 = _
@@ -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"
@@ -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
@@ -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
@@ -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
+            }
         }
     ]
 }
@@ -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"
+        }
+    ]
+}
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,21 @@`
`1`	`1`	`{`
`2`		`- "version": "0.1.0",`
	`2`	`+ "version": "2.0.0",`
`3`	`3`	`"command": "dotnet",`
`4`		`- "isShellCommand": true,`
`5`	`4`	`"args": [],`
`6`	`5`	`"tasks": [`
`7`	`6`	`{`
`8`		`- "taskName": "build",`
	`7`	`+ "label": "build",`
	`8`	`+ "type": "shell",`
	`9`	`+ "command": "dotnet",`
`9`	`10`	`"args": [`
	`11`	`+ "build",`
`10`	`12`	`"${workspaceRoot}/sample/Serilog.Sinks.Elasticsearch.Sample/Serilog.Sinks.Elasticsearch.Sample.csproj"`
`11`	`13`	`],`
`12`		`- "isBuildCommand": true,`
`13`		`- "problemMatcher": "$msCompile"`
	`14`	`+ "problemMatcher": "$msCompile",`
	`15`	`+ "group": {`
	`16`	`+ "_id": "build",`
	`17`	`+ "isDefault": false`
	`18`	`+ }`
`14`	`19`	`}`
`15`	`20`	`]`
`16`	`21`	`}`