Merge pull request #35 from serilog/dev

2.0.0 Release

Author: nblumhardt

Build.ps1

@@ -11,7 +11,7 @@ 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 "master" -and $revision -ne "local"]
+$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 ""]
 
@@ -45,4 +45,4 @@ foreach ($test in ls test/*.Tests) {
     Pop-Location
 }
 
-Pop-Location
+Pop-Location

appveyor.yml

@@ -1,7 +1,6 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2019
-configuration: Release
+image: Visual Studio 2022
 install:
   - ps: mkdir -Force ".\build\" | Out-Null
 build_script:
@@ -19,15 +18,15 @@ only_commits:
 deploy:
 - provider: NuGet
   api_key:
-    secure: GvzC+u5V9MCsCq/tMKxGvzhxRxxRk0RDHpKOjySL+WoJgIKnrjoqZRgdjEFrY3SC
+    secure: pXU3a6E4Uw0FJdGVwt+GP5XCjYU5KDUe6XWE77fWk6K0ujid44X9EbIYxhrhChbu
   skip_symbols: true
   on:
-    branch: /^(master|dev)$/
+    branch: /^(main|dev)$/
 - provider: GitHub
   auth_token:
     secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
   artifact: /Serilog.*\.nupkg/
   tag: v$(appveyor_build_version)
   on:
-    branch: master
+    branch: main
 

global.json

@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.202"
+    "version": "5.0.202",
+    "rollForward": "latestMajor"
   }
 }

src/Serilog.Formatting.Compact.Reader/LogEventReader.cs

@@ -124,7 +124,7 @@ static LogEvent ReadFromJObject(int lineNumber, JObject jObject)
 
             var level = LogEventLevel.Information;
             if (TryGetOptionalField(lineNumber, jObject, ClefFields.Level, out string l))
-                level = (LogEventLevel)Enum.Parse(typeof(LogEventLevel), l);
+                level = (LogEventLevel)Enum.Parse(typeof(LogEventLevel), l, true);
             Exception exception = null;
             if (TryGetOptionalField(lineNumber, jObject, ClefFields.Exception, out string ex))
                 exception = new TextException(ex);

src/Serilog.Formatting.Compact.Reader/Serilog.Formatting.Compact.Reader.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>1.0.5</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.0;net45</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Serilog" Version="2.3.0" />
   </ItemGroup>
 

test/Serilog.Formatting.Compact.Reader.Tests/LogEventReaderTests.clef

@@ -1,6 +1,6 @@
 {"@t":"2016-10-12T04:20:58.0554314Z","@mt":"Hello, {@User}","User":{"Name":"nblumhardt","Id":101}}
 {"@t":"2016-10-12T04:20:58.0684369Z","@mt":"Number {N:x8}","@r":["0000002a"],"N":42}
-{"@t":"2016-10-12T04:20:58.0724384Z","@mt":"Tags are {Tags}","@l":"Warning","Tags":["test","orange"]}
-{"@t":"2016-10-12T04:20:58.0904378Z","@mt":"Something failed","@l":"Error","@x":"System.DivideByZeroException: Attempted to divide by zero.\r\n   at Example.Program.Main(String[] args) in C:\\Development\\nblumhardt\\serilog-formatting-compact-reader\\example\\RoundTrip\\Program.cs:line 24"}
+{"@t":"2016-10-12T04:20:58.0724384Z","@mt":"Tags are {Tags}","@l":"WaRNiNg","Tags":["test","orange"]}
+{"@t":"2016-10-12T04:20:58.0904378Z","@mt":"Something failed","@l":"ERROR","@x":"System.DivideByZeroException: Attempted to divide by zero.\r\n   at Example.Program.Main(String[] args) in C:\\Development\\nblumhardt\\serilog-formatting-compact-reader\\example\\RoundTrip\\Program.cs:line 24"}
 {"@t":"2016-10-12T04:20:59.0554314Z","@m":"Hello, nblumhardt","@i":"123abc00","N":42}
 {"@t":"2019-09-10T04:56:50.608125300+00:00","@l":null,"Method":"POST","@mt":"HTTP {Method} {RequestPath} responded {StatusCode} in {Elapsed:0.000} ms","RequestPath":"/api/customers","SourceContext":"DemoMiddleware","@r":["799.724"],"Elapsed":799.72430000000008,"@i":2568106828,"@m":"HTTP POST /api/customers responded 400 in 799.724 ms","RequestId":"8786927172fc4abe","StatusCode":400}

test/Serilog.Formatting.Compact.Reader.Tests/Serilog.Formatting.Compact.Reader.Tests.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="xunit" Version="2.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>