From 8556d610244dfbc02d443423d4518f15623290b7 Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Sun, 2 Nov 2025 14:33:38 +1000
Subject: [PATCH 1/2] Switch build to Actions

---
 .github/.DS_Store         | Bin 0 -> 8196 bytes
 .github/workflows/ci.yml  |  41 +++++++++++++++++
 .gitignore                |   2 +
 Build.ps1                 |  93 +++++++++++++++++++++++++-------------
 Directory.Build.props     |  25 ++++++++++
 Directory.Version.props   |   5 ++
 appveyor.yml              |  22 ---------
 build.sh                  |  18 --------
 serilog-sinks-console.sln |  15 +++++-
 9 files changed, 148 insertions(+), 73 deletions(-)
 create mode 100644 .github/.DS_Store
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 Directory.Build.props
 create mode 100644 Directory.Version.props
 delete mode 100644 appveyor.yml
 delete mode 100755 build.sh

diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..39056af1449efe4ddb9dca58ec1f3c2361c3d376
GIT binary patch
literal 8196
zcmeHMU2GIp6u#fIzziMe07Vw;goQ$oW`QnLTmH=UPx&vfE#0=jvb!_Tf!Ud5XSXes
z#>T`K5R6Y6|9R4A<iUUvUnEfheN;5T5Fdyd^#v1rQF-vp+*wlklki{&>P#~C+<VVC
z_s%)<eRF%Zj4?D9wJ2jD#+XRAE0qdrCb(R^dyl&Wf5ugU{24pQOlGqI=A;M4SqBqA
z27(L(83-~EWFW}E!;k?wv)xOa<lN`lpbat*WZ-|90r&e5rrVV<Uyg9;eLAS|N&u4O
zH0@o~r#is%3HvhU%MmU;S6Y)-5Aa>#ml)vgqz}91BxAlD;gY*EaCZiOXZRHgyxqw!
z?3pvfxD47L13?DHXTYV6L>0Tu^6bdy`rXN;O*>86i|L$cIEA{pZy}VGPnkMRoF-O?
z`{I4}K)jGD6rJW&zSkXf*tVH2^;79RhCYx~s#<KTkTNVi?>QKnP9}T13`?^In(d;c
zIi7EvD?~|@l1gZ3C>o7~qigDiBjKTF{S&Jr;l^m)@USG#ty#5xck+mtwd|8T82BFq
zHe*b1rzVcfJQR&*>}+n7^#t*oPJauJzbsyg|GQHB()0>>hT4_r?&+12%Itm$v^`fa
zY|GiB=N*zsrP85<Y|hx$&b;pGyE3*}%vw%TnUzVInWC90=uM^>H;(HxSLtN(wrTFP
z9m8FwJ5kUF3$AXQD$(QE`9h1gSi+$7xs_6M^xZlwYV_-^w6s$-Dm=Ff>D<hD3zs~$
zVs*oYSlj09yRKC#vu4k!lI0%Cyj3s`8hXBSz|abP-6<!dTbf}V>gqQfBW>y(Rw}E{
zLPV0TRfgs-c(htoCo@eH)5g)FQ8=d5h@!Vgc#$ga)##bF+nT$Jrd$wd9ol{AB312m
zH7$9aTFrM@UaQI-4h65Ie8ZKiWVz!AK}K=hM<CZV^|IP&rqa5pXcFJ2ajmR&_4E8I
zTm8w6RkE6(x1FUB9e=K=SylJD+ipuah4!3o(IZ{;_kN0WJx*ULueT2nWc}GKH0!-m
zns=SrG^1d9O3KC#ilW<Hu1V9p7#4))SE_NfQ&heZlZs+k{RYv5UMpvdSW|j6HL+UW
zt+|xF<n_En*Tm}hv_wau%2u;hwv8PidJeJE>}7VAooAo3%j_HWJ^O{-Vt)Xb3JKFu
zfhsJ(5=8Jg8qkQfXhu7BVK?H~i#`}Q3<rZajv<`Db2y3TaT;gv5?;rfcnfFoE<V6{
zT)>C;1Xu9|zQotKi68JIe!?yMiNA11m?F#*Lc)Auu@Dhf2rGpKp;1^TtQU3&?LtCG
z35Nw+7~}y6C2H>D<5DXequ#`%^FKPmxrs?v{q&~ITekjtNOyfEr`g;`=7pEmuBva`
z*mM_;9KR*VjwXVK{(Cs%q2EKt8022#e3TcKxH^`YokSabP;}X=Oykyz<s~A~Mw!Bg
z%jD%E5k{HHhmq=)B2iQkyrCSeULz3^l`=kzR5wVX0zOzLZ;*(RN;w~@a!isG<_)S_
zs@p`Ol_LIAc)!kWvY**+><;05Cgvc7WvC;RKZ#A)K{$6&-iiH4B84<GWMLtPqlEYq
z7{)Ug!Lv9;h(CiD@FHHpt9T7>;BCA^sDBUd6Xrj{MSP4;@fj}TijV#qg#BM}dkmhp
zmypaQexDf6S-Z8>KSagbwKs6G_e#@bmfC$<=KAjE`09`6Ez`CR(QYLU@<+X=E#sq*
zTmQFB{`>zuKEWW!K#+m|Rt8Ys8gFf;m?ryHxV3he?gMnYmuok|rRPG8SB{hP%5jo+
n|6xe|FqyhOF<*{wNi%dk@E-ym<R9I^`5&DBUJ?E9o&SFWX_C-@

literal 0
HcmV?d00001

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..acd3bc6
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,41 @@
+# If this file is renamed, the incrementing run attempt number will be reset.
+
+name: CI
+
+on:
+  push:
+    branches: [ "dev", "main" ]
+  pull_request:
+    branches: [ "dev", "main" ]
+
+env:
+  CI_BUILD_NUMBER_BASE: ${{ github.run_number }}
+  CI_TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  build:
+
+    # The build must run on Windows so that .NET Framework targets can be built and tested.
+    runs-on: windows-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+      - name: Compute build number
+        shell: bash
+        run: |
+          echo "CI_BUILD_NUMBER=$(($CI_BUILD_NUMBER_BASE+2300))" >> $GITHUB_ENV
+      - name: Build and Publish
+        env:
+          DOTNET_CLI_TELEMETRY_OPTOUT: true
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: pwsh
+        run: |
+          ./Build.ps1
diff --git a/.gitignore b/.gitignore
index 94420dc..4f6c9b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,3 +234,5 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+
+.DS_Store/
diff --git a/Build.ps1 b/Build.ps1
index ba41ab1..e798284 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -1,48 +1,79 @@
-echo "build: Build started"
+Write-Output "build: Tool versions follow"
+
+dotnet --version
+dotnet --list-sdks
+
+Write-Output "build: Build started"
 
 Push-Location $PSScriptRoot
+try {
+    if(Test-Path .\artifacts) {
+        Write-Output "build: Cleaning ./artifacts"
+        Remove-Item ./artifacts -Force -Recurse
+    }
 
-if(Test-Path .\artifacts) {
-	echo "build: Cleaning .\artifacts"
-	Remove-Item .\artifacts -Force -Recurse
-}
+    & dotnet restore --no-cache
 
-& dotnet restore --no-cache
+    $dbp = [Xml] (Get-Content .\Directory.Version.props)
+    $versionPrefix = $dbp.Project.PropertyGroup.VersionPrefix
 
-$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
-$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
-$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"]
-$commitHash = $(git rev-parse --short HEAD)
-$buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""]
+    Write-Output "build: Package version prefix is $versionPrefix"
 
-echo "build: Package version suffix is $suffix"
-echo "build: Build version suffix is $buildSuffix" 
+    $branch = @{ $true = $env:CI_TARGET_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$NULL -ne $env:CI_TARGET_BRANCH];
+    $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:CI_BUILD_NUMBER, 10); $false = "local" }[$NULL -ne $env:CI_BUILD_NUMBER];
+    $suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)) -replace '([^a-zA-Z0-9\-]*)', '')-$revision"}[$branch -eq "main" -and $revision -ne "local"]
+    $commitHash = $(git rev-parse --short HEAD)
+    $buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""]
 
-foreach ($src in ls src/*) {
-    Push-Location $src
+    Write-Output "build: Package version suffix is $suffix"
+    Write-Output "build: Build version suffix is $buildSuffix"
 
-	echo "build: Packaging project in $src"
+    & dotnet build -c Release --version-suffix=$buildSuffix /p:ContinuousIntegrationBuild=true
+    if($LASTEXITCODE -ne 0) { throw "Build failed" }
 
-    & dotnet build -c Release --version-suffix=$buildSuffix -p:EnableSourceLink=true
-    if ($suffix) {
-        & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --no-build
-    } else {
-        & dotnet pack -c Release -o ..\..\artifacts --no-build
+    foreach ($src in Get-ChildItem src/*) {
+        Push-Location $src
+
+        Write-Output "build: Packaging project in $src"
+
+        if ($suffix) {
+            & dotnet pack -c Release --no-build --no-restore  -o ../../artifacts --version-suffix=$suffix
+        } else {
+            & dotnet pack -c Release --no-build --no-restore  -o ../../artifacts
+        }
+        if($LASTEXITCODE -ne 0) { throw "Packaging failed" }
+
+        Pop-Location
     }
-    if($LASTEXITCODE -ne 0) { throw "build failed" }    
 
-    Pop-Location
-}
+    foreach ($test in Get-ChildItem test/*.Tests) {
+        Push-Location $test
+
+        Write-Output "build: Testing project in $test"
+
+        & dotnet test -c Release --no-build --no-restore
+        if($LASTEXITCODE -ne 0) { throw "Testing failed" }
+
+        Pop-Location
+    }
+
+    if ($env:NUGET_API_KEY) {
+        # GitHub Actions will only supply this to branch builds and not PRs. We publish
+        # builds from any branch this action targets (i.e. main and dev).
 
-foreach ($test in ls test/*.Tests) {
-    Push-Location $test
+        Write-Output "build: Publishing NuGet packages"
 
-	echo "build: Testing project in $test"
+        foreach ($nupkg in Get-ChildItem artifacts/*.nupkg) {
+            & dotnet nuget push -k $env:NUGET_API_KEY -s https://api.nuget.org/v3/index.json "$nupkg"
+            if($LASTEXITCODE -ne 0) { throw "Publishing failed" }
+        }
 
-    & dotnet test -c Release
-    if($LASTEXITCODE -ne 0) { throw "tests failed" }    
+        if (!($suffix)) {
+            Write-Output "build: Creating release for version $versionPrefix"
 
+            iex "gh release create v$versionPrefix --title v$versionPrefix --generate-notes $(get-item ./artifacts/*.nupkg) $(get-item ./artifacts/*.snupkg)"
+        }
+    }
+} finally {
     Pop-Location
 }
-
-Pop-Location
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..c114992
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+  <!-- Properties in this file are expected to be identical for all Serilog organization projects. If
+   a property value is project-specific, please record it in the CSPROJ file instead. -->
+  <Import Project="$(MSBuildThisFileDirectory)Directory.Version.props" />
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <!-- The condition is required to support BenchmarkDotNet -->
+    <SignAssembly Condition="Exists('$(MSBuildThisFileDirectory)assets/Serilog.snk')">true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)assets/Serilog.snk</AssemblyOriginatorKeyFile>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>
diff --git a/Directory.Version.props b/Directory.Version.props
new file mode 100644
index 0000000..e37c3ef
--- /dev/null
+++ b/Directory.Version.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>6.1.0</VersionPrefix>
+  </PropertyGroup>
+</Project>
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 0a0eb08..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: '{build}'
-skip_tags: true
-image: Visual Studio 2022
-test: off
-build_script:
-- pwsh: ./Build.ps1
-artifacts:
-- path: artifacts/Serilog.*.nupkg
-deploy:
-- provider: NuGet
-  api_key:
-    secure: ZpUO4ECx4c/V0Ecj04cfV1UGd+ZABeEG9DDW2fjG8vITjNYhmbiiJH0qNOnRy2G3
-  skip_symbols: true
-  on:
-    branch: /^(main|dev)$/
-- provider: GitHub
-  auth_token:
-    secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
-  artifact: /Serilog.*\.nupkg/
-  tag: v$(appveyor_build_version)
-  on:
-    branch: main
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 64d87ea..0000000
--- a/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-dotnet --info
-dotnet restore
-
-for path in src/**/*.csproj; do
-    dotnet build -f netstandard2.0 -c Release ${path}
-done
-
-for path in test/*.Tests/*.csproj; do
-    dotnet test -f netcoreapp2.2 -c Release ${path}
-done
-
-for path in sample/ConsoleDemo/*.csproj; do
-    dotnet build -f netcoreapp2.2 -c Release ${path}
-    dotnet run -f netcoreapp2.2 --project ${path}
-done
diff --git a/serilog-sinks-console.sln b/serilog-sinks-console.sln
index e223156..9e93a9c 100644
--- a/serilog-sinks-console.sln
+++ b/serilog-sinks-console.sln
@@ -5,11 +5,10 @@ VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}"
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
 		CHANGES.md = CHANGES.md
 		LICENSE = LICENSE
@@ -29,6 +28,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleDemo", "sample\Conso
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyncWritesDemo", "sample\SyncWritesDemo\SyncWritesDemo.csproj", "{633AE0AD-C9D4-440D-874A-C0F4632DB75F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{91B268E6-3BCF-49B4-A04D-8467AE23410A}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F4C015DE-80BA-4D63-9D3D-D687999B4960}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -60,6 +70,7 @@ Global
 		{1D56534C-4009-42C2-A573-789CAE6B8AA9} = {7D0692CD-F95D-4BF9-8C63-B4A1C078DF23}
 		{DBF4907A-63A2-4895-8DEF-59F90C20380B} = {CF817664-4CEC-4B6A-9C57-A0D687757D82}
 		{633AE0AD-C9D4-440D-874A-C0F4632DB75F} = {CF817664-4CEC-4B6A-9C57-A0D687757D82}
+		{F4C015DE-80BA-4D63-9D3D-D687999B4960} = {91B268E6-3BCF-49B4-A04D-8467AE23410A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {43C32ED4-D39A-4E27-AE99-7BB8C883833C}

From 95e0cc6f60749bbd16d82b3b1880fc17c78ec15b Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Sun, 2 Nov 2025 14:42:55 +1000
Subject: [PATCH 2/2] Tidy up CSPROJ

---
 src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj | 10 ----------
 .../Serilog.Sinks.Console.Tests.csproj                 |  6 +-----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj b/src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj
index 824dd05..f3fd276 100644
--- a/src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj
+++ b/src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj
@@ -1,24 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>A Serilog sink that writes log events to the console/terminal.</Description>
-        <VersionPrefix>6.1.0</VersionPrefix>
         <Authors>Serilog Contributors</Authors>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net471</TargetFrameworks>
         <TargetFrameworks>$(TargetFrameworks);netstandard2.0;net6.0;net8.0</TargetFrameworks>
-        <Nullable>enable</Nullable>
-        <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
-        <SignAssembly>true</SignAssembly>
-        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
         <PackageTags>serilog;console;terminal</PackageTags>
         <PackageIcon>icon.png</PackageIcon>
         <PackageProjectUrl>https://github.com/serilog/serilog-sinks-console</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-        <RepositoryUrl>https://github.com/serilog/serilog-sinks-console</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
         <RootNamespace>Serilog</RootNamespace>
-        <LangVersion>latest</LangVersion>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
diff --git a/test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj b/test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj
index 472965f..2a72fac 100644
--- a/test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj
+++ b/test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj
@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>