Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .github/workflows/pr-analysis-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ on:

jobs:
build-and-codeql:
runs-on: windows-latest
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand All @@ -28,6 +28,7 @@ jobs:

- name: Run build
run: ./Build.ps1 -SkipTests
shell: pwsh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-analysis-devskim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run DevSkim scanner
uses: microsoft/DevSkim-Action@v1

- name: Upload DevSkim scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: devskim-results.sarif
42 changes: 0 additions & 42 deletions .github/workflows/pr-analysis-infersharp.yml

This file was deleted.

35 changes: 30 additions & 5 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,46 @@ on:

jobs:
build-and-test:
runs-on: windows-latest
runs-on: windows-latest # SQL Server LocalDB used in tests requires Windows
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run build and tests
run: ./Build.ps1
shell: pwsh

- name: Upload binaries artifact for InferSharp workflow
uses: actions/upload-artifact@v3
- name: Upload binaries artifact for InferSharp job
uses: actions/upload-artifact@v4
with:
name: bin-net6
path: src\Serilog.Sinks.MSSqlServer\bin\Release\net6.0

- name: Upload testresults artifact with code coverage file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: testresults
path: test\Serilog.Sinks.MSSqlServer.Tests\TestResults

infersharp:
runs-on: ubuntu-latest # Container action used by Infer# requires Linux
needs: build-and-test
permissions:
actions: read
contents: read
security-events: write
steps:
- name: Download binaries artifact
uses: actions/download-artifact@v4
with:
name: bin-net6
path: bin-net6

- name: Run Infer#
uses: microsoft/[email protected]
with:
binary-path: bin-net6

- name: Upload SARIF output to GitHub Security Center
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: infer-out/report.sarif
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build-and-release:
runs-on: ubuntu-latest
runs-on: windows-latest # Build on Windows to ensure .NET Framework targets
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -53,4 +53,4 @@ jobs:
env:
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
run: |
nuget push artifacts/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_API_KEY }}
nuget push artifacts\*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_API_KEY }}
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 7.0.1
* Fixed issue #567: .NET Framework assemblies were not built properly

# 7.0.0
* Fixed issue #543: Update to Serilog v4, remove reference to Serilog.Sinks.PeriodicBatching (thanks to @cancakar35)
* Full automatic release and run on ubuntu-latest agent
Expand Down
1 change: 0 additions & 1 deletion serilog-sinks-mssqlserver.sln
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md
.github\workflows\pr-analysis-codeql.yml = .github\workflows\pr-analysis-codeql.yml
.github\workflows\pr-analysis-devskim.yml = .github\workflows\pr-analysis-devskim.yml
.github\workflows\pr-analysis-infersharp.yml = .github\workflows\pr-analysis-infersharp.yml
.github\workflows\pr-validation.yml = .github\workflows\pr-validation.yml
README.md = README.md
.github\workflows\release.yml = .github\workflows\release.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<Description>A Serilog sink that writes events to Microsoft SQL Server and Azure SQL</Description>
<VersionPrefix>7.0.0</VersionPrefix>
<EnablePackageValidation>false</EnablePackageValidation>
<VersionPrefix>7.0.1</VersionPrefix>
<EnablePackageValidation>true</EnablePackageValidation>
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
<Authors>Michiel van Oudheusden;Christian Kadluba;Serilog Contributors</Authors>
<TargetFrameworks>netstandard2.0;net462;net472;net6.0</TargetFrameworks>
Expand Down