From b0fde62c663c7e63e38c04897f47fef5863bb6ff Mon Sep 17 00:00:00 2001 From: Christian Kadluba <10721825+ckadluba@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:50:40 +0200 Subject: [PATCH 1/5] Post release changes Bumped patch version and enable package validation after release. --- .../Serilog.Sinks.MSSqlServer.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj index 75035c1d..8e82e129 100644 --- a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj +++ b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj @@ -2,8 +2,8 @@ A Serilog sink that writes events to Microsoft SQL Server and Azure SQL - 7.0.0 - false + 7.0.1 + true 7.0.0 Michiel van Oudheusden;Christian Kadluba;Serilog Contributors netstandard2.0;net462;net472;net6.0 From 6281a8115e2e1cd5b4857c230277a26e5270c539 Mon Sep 17 00:00:00 2001 From: Christian Kadluba <10721825+ckadluba@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:39:48 +0200 Subject: [PATCH 2/5] Consolidated PR validation workflows * Updated any obsolete actions used in the workflows * Use Linux agents whereever possible * Merged PR Analysis InferSharp into PR Validation workflow (still as a separate job because of conflicting OS requirements of integration tests and InterSharp) --- .github/workflows/pr-analysis-codeql.yml | 5 ++- .github/workflows/pr-analysis-devskim.yml | 4 +- .github/workflows/pr-analysis-infersharp.yml | 42 -------------------- .github/workflows/pr-validation.yml | 35 +++++++++++++--- serilog-sinks-mssqlserver.sln | 1 - 5 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/pr-analysis-infersharp.yml diff --git a/.github/workflows/pr-analysis-codeql.yml b/.github/workflows/pr-analysis-codeql.yml index 0c2b81b0..46e8bb93 100644 --- a/.github/workflows/pr-analysis-codeql.yml +++ b/.github/workflows/pr-analysis-codeql.yml @@ -11,7 +11,7 @@ on: jobs: build-and-codeql: - runs-on: windows-latest + runs-on: ubuntu-latest permissions: actions: read contents: read @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v3 @@ -28,6 +28,7 @@ jobs: - name: Run build run: ./Build.ps1 -SkipTests + shell: pwsh - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/pr-analysis-devskim.yml b/.github/workflows/pr-analysis-devskim.yml index 9ad138f2..80185a82 100644 --- a/.github/workflows/pr-analysis-devskim.yml +++ b/.github/workflows/pr-analysis-devskim.yml @@ -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 diff --git a/.github/workflows/pr-analysis-infersharp.yml b/.github/workflows/pr-analysis-infersharp.yml deleted file mode 100644 index 9d91ebdb..00000000 --- a/.github/workflows/pr-analysis-infersharp.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: PR Analysis InferSharp - -on: - workflow_run: - workflows: [ "PR Validation" ] - types: - - completed - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -jobs: - download-and-infersharp: - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - steps: - - name: Download binaries artifact from PR Validation workflow - id: download-artifact - uses: dawidd6/action-download-artifact@v2 - with: - workflow: pr-validation.yml - workflow_conclusion: success - name: bin-net6 - path: bin-net6 - branch: ${{ github.ref }} - check_artifacts: true - search_artifacts: true - - - name: Run Infer# - uses: microsoft/infersharpaction@v1.4 - id: runinfersharp - with: - binary-path: bin-net6 - - - name: Upload SARIF output to GitHub Security Center - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: infer-out/report.sarif diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index eed51488..bc5e2535 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -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/infersharpaction@v1.5 + 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 diff --git a/serilog-sinks-mssqlserver.sln b/serilog-sinks-mssqlserver.sln index 224100e3..2c4ed1be 100644 --- a/serilog-sinks-mssqlserver.sln +++ b/serilog-sinks-mssqlserver.sln @@ -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 From 029a2822507f1789ffb1a1d1a94c7ecc3f9d7883 Mon Sep 17 00:00:00 2001 From: Christian Kadluba <10721825+ckadluba@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:31:45 +0200 Subject: [PATCH 3/5] Release build on Windows for .NET Framework Run build in release.yml again in on windows-latest agent to fix a problem with the .NET Framework binaries in the nuget package as described in #567. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b2ac6b4..89078597 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: From 4710d71d78a34aa3887a47c93ac05eb29f0ef075 Mon Sep 17 00:00:00 2001 From: Christian Kadluba <10721825+ckadluba@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:52:01 +0200 Subject: [PATCH 4/5] Fixed nuget push syntax error --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89078597..5d0ccce6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 }} From 22ed9fef7a4cdb99a39208fa34a5b8b9acfba878 Mon Sep 17 00:00:00 2001 From: Christian Kadluba <10721825+ckadluba@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:55:44 +0200 Subject: [PATCH 5/5] Update CHANGES.md --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 74621757..9601678f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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