Merge pull request #27 from serilog/dev

4.0.0 Release

Author: nblumhardt

.idea/.idea.serilog-sinks-trace/.idea/.gitignore

@@ -12,32 +12,24 @@ if(Test-Path .\artifacts) {
 $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 ""]
 
-echo "build: Version suffix is $suffix"
+echo "build: Package version suffix is $suffix"
+echo "build: Build version suffix is $buildSuffix" 
 
 foreach ($src in ls src/*) {
     Push-Location $src
 
 	echo "build: Packaging project in $src"
 
+    & dotnet build -c Release --version-suffix=$buildSuffix -p:EnableSourceLink=true
     if ($suffix) {
-        & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --include-source
+        & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --no-build
     } else {
-        & dotnet pack -c Release -o ..\..\artifacts --include-source
+        & dotnet pack -c Release -o ..\..\artifacts --no-build
     }
-    
-    if($LASTEXITCODE -ne 0) { exit 1 }    
-
-    Pop-Location
-}
-
-foreach ($test in ls test/*.PerformanceTests) {
-    Push-Location $test
-
-	echo "build: Building performance test project in $test"
-
-    & dotnet build -c Release
-    if($LASTEXITCODE -ne 0) { exit 2 }
+    if($LASTEXITCODE -ne 0) { throw "build failed" }    
 
     Pop-Location
 }
@@ -48,9 +40,9 @@ foreach ($test in ls test/*.Tests) {
 	echo "build: Testing project in $test"
 
     & dotnet test -c Release
-    if($LASTEXITCODE -ne 0) { exit 3 }
+    if($LASTEXITCODE -ne 0) { throw "tests failed" }    
 
     Pop-Location
 }
 
-Pop-Location
+Pop-Location

.idea/.idea.serilog-sinks-trace/.idea/encodings.xml

@@ -1,5 +1,9 @@
 # Serilog.Sinks.Trace [![Build status](https://ci.appveyor.com/api/projects/status/v1oe03lx3wymyy7j/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-trace/branch/master) [![NuGet Version](http://img.shields.io/nuget/v/Serilog.Sinks.Trace.svg?style=flat)](https://www.nuget.org/packages/Serilog.Sinks.Trace/)
 
+> **Note:** this sink writes regular log events to `System.Diagnostics.Trace`. If you're looking for 
+> distributed/hierarchical tracing with Serilog, see [SerilogTracing](https://github.com/serilog-tracing/serilog-tracing)
+> instead.
+
 Writes [Serilog](https://serilog.net) events to `System.Diagnostics.Trace`.
 
 ```csharp

.idea/.idea.serilog-sinks-trace/.idea/indexLayout.xml

@@ -1,23 +1,22 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2019
-configuration: Release
-test: off
+image: Visual Studio 2022
 build_script:
-- ps: ./Build.ps1
+    - pwsh: ./Build.ps1
+test: off
 artifacts:
-- path: artifacts/Serilog.*.nupkg
+    - path: artifacts/Serilog.*.nupkg
 deploy:
-- provider: NuGet
-  api_key:
-    secure: rbdBqxBpLt4MkB+mrDOYNDOd8aVZ1zMkysaVNAXNKnC41FYifzX3l9LM8DCrUWU5
-  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
+    - 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

.idea/.idea.serilog-sinks-trace/.idea/vcs.xml

@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{EF92FC
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
-		NuGet.Config = NuGet.Config
 		README.md = README.md
 	EndProjectSection
 EndProject

Build.ps1

@@ -1,34 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Description>The diagnostic trace sink for Serilog.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
-    <Authors>Serilog Contributors</Authors>
-    <TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageTags>serilog;trace;diagnostic</PackageTags>
-    <PackageProjectUrl>https://github.com/serilog/serilog-sinks-trace</PackageProjectUrl>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageIcon>serilog-sink-nuget.png</PackageIcon>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Description>The System.Diagnostics.Trace sink for Serilog.</Description>
+        <VersionPrefix>4.0.0</VersionPrefix>
+        <Authors>Serilog Contributors</Authors>
+        <!-- .NET Framework version targeting is frozen at these two TFMs. -->
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net471;net462</TargetFrameworks>
+        <!-- Policy is to trim TFM-specific builds to `netstandard2.0`, `net6.0`,
+        all active LTS versions, and optionally the latest RTM version, when releasing new
+        major Serilog versions. -->
+        <TargetFrameworks>$(TargetFrameworks);net8.0;net6.0;netstandard2.0</TargetFrameworks>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
+        <SignAssembly>true</SignAssembly>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageTags>serilog;trace;diagnostic</PackageTags>
+        <PackageProjectUrl>https://github.com/serilog/serilog-sinks-trace</PackageProjectUrl>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PackageIcon>serilog-sink-nuget.png</PackageIcon>
+        <LangVersion>12</LangVersion>
+        <Nullable>enable</Nullable>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RootNamespace>Serilog</RootNamespace>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.10.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Serilog" Version="4.0.0"/>
+        <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all"/>
+    </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\assets\serilog-sink-nuget.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\assets\serilog-sink-nuget.png" Pack="true" Visible="false" PackagePath="/" />
+        <None Include="..\..\README.md" Pack="true" Visible="false" PackagePath="/" />
+    </ItemGroup>
 
 </Project>

README.md

@@ -13,40 +13,45 @@
 // limitations under the License.
 
 using System;
-using System.Diagnostics;
 using System.IO;
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
 
-namespace Serilog.Sinks.DiagnosticTrace
+namespace Serilog.Sinks.Trace;
+
+class TraceSink : ILogEventSink
 {
-    class TraceSink : ILogEventSink
-    {
-        readonly ITextFormatter _textFormatter;
+    readonly ITextFormatter _textFormatter;
 
-        public TraceSink(ITextFormatter textFormatter)
-        {
-            if (textFormatter == null) throw new ArgumentNullException(nameof(textFormatter));
-            _textFormatter = textFormatter;
-        }
+    public TraceSink(ITextFormatter textFormatter)
+    {
+        _textFormatter = textFormatter;
+    }
 
-        public void Emit(LogEvent logEvent)
-        {
-            if (logEvent == null) throw new ArgumentNullException(nameof(logEvent));
-            var sr = new StringWriter();
-            _textFormatter.Format(logEvent, sr);
+    public void Emit(LogEvent logEvent)
+    {
+        if (logEvent == null) throw new ArgumentNullException(nameof(logEvent));
+        var sr = new StringWriter();
+        _textFormatter.Format(logEvent, sr);
 
-            var text = sr.ToString().Trim();
+        var text = sr.ToString().Trim();
 
-            if (logEvent.Level == LogEventLevel.Error || logEvent.Level == LogEventLevel.Fatal)
-                Trace.TraceError(text);
-            else if (logEvent.Level == LogEventLevel.Warning)
-                Trace.TraceWarning(text);
-            else if (logEvent.Level == LogEventLevel.Information)
-                Trace.TraceInformation(text);
-            else
-                Trace.WriteLine(text);
+        switch (logEvent.Level)
+        {
+            case LogEventLevel.Error:
+            case LogEventLevel.Fatal:
+                System.Diagnostics.Trace.TraceError(text);
+                break;
+            case LogEventLevel.Warning:
+                System.Diagnostics.Trace.TraceWarning(text);
+                break;
+            case LogEventLevel.Information:
+                System.Diagnostics.Trace.TraceInformation(text);
+                break;
+            default:
+                System.Diagnostics.Trace.WriteLine(text);
+                break;
         }
     }
-}
+}