Merge pull request #238 from serilog/dev

3.2.0 Release
serilog · Aug 11, 2021 · 816581f · 816581f
2 parents fc0969f + 60ed15e
commit 816581f
Show file tree

Hide file tree

Showing 39 changed files with 1,158 additions and 275 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,8 +5,9 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+end_of_line = lf
 
-[*.{csproj,json,config,yml}]
+[*.{csproj,json,config,yml,props}]
 indent_size = 2
 
 [*.sh]

diff --git a/.gitignore b/.gitignore
@@ -201,4 +201,6 @@ FakesAssemblies/
 project.lock.json
 
 #Test files
-*.txt
+*.txt
+
+artifacts/
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,33 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/sample/Sample/bin/Debug/netcoreapp3.1/Sample.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/sample/Sample",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "stopAtEntry": false,
+            "linux": {
+              "env": {
+                "TEMP": "/tmp"
+              }
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/sample/Sample/Sample.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/sample/Sample/Sample.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/sample/Sample/Sample.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/Build.ps1 b/Build.ps1
@@ -2,48 +2,70 @@ echo "build: Build started"
 
 Push-Location $PSScriptRoot
 
-if(Test-Path .\artifacts) {
-	echo "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
 
 $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"]
 
 echo "build: Version suffix is $suffix"
 
-foreach ($src in ls src/*) {
+foreach ($src in dir src/*) {
     Push-Location $src
 
-	echo "build: Packaging project in $src"
+    echo "build: Packaging project in $src"
 
-    & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --include-source
-    if($LASTEXITCODE -ne 0) { exit 1 }    
+    & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix -p:ContinuousIntegrationBuild=true
+    if ($LASTEXITCODE -ne 0) { exit 1 }
 
     Pop-Location
 }
 
-foreach ($test in ls test/*.PerformanceTests) {
+foreach ($test in dir test/*.PerformanceTests) {
     Push-Location $test
 
-	echo "build: Building performance test project in $test"
+    echo "build: Building performance test project in $test"
 
     & dotnet build -c Release
-    if($LASTEXITCODE -ne 0) { exit 2 }
+    if ($LASTEXITCODE -ne 0) { exit 2 }
 
     Pop-Location
 }
 
-foreach ($test in ls test/*.Tests) {
+foreach ($test in dir test/*.Tests) {
     Push-Location $test
 
-	echo "build: Testing project in $test"
+    echo "build: Testing project in $test"
 
-    & dotnet test -c Release
-    if($LASTEXITCODE -ne 0) { exit 3 }
+    if ($PSVersionTable.Platform -eq "Unix") {
+        & dotnet test -c Release -f netcoreapp2.1
+        & dotnet test -c Release -f netcoreapp3.1
+        & dotnet test -c Release -f net50
+    } else {
+        & dotnet test -c Release
+    }
+
+    if ($LASTEXITCODE -ne 0) { exit 3 }
+
+    Pop-Location
+}
+
+if ($PSVersionTable.Platform -eq "Unix") {
+    Push-Location sample/Sample
+
+    & dotnet run -f netcoreapp2.1 -c Release --run-once
+    if ($LASTEXITCODE -ne 0) { exit 4 }
+
+    & dotnet run -f netcoreapp3.1 -c Release --run-once
+    if ($LASTEXITCODE -ne 0) { exit 4 }
+
+    & dotnet run -f net50         -c Release --run-once
+    if ($LASTEXITCODE -ne 0) { exit 4 }
 
     Pop-Location
 }

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,90 @@
+# Changelog
+
+3.2.0 (pre-release)
+
+* #162 - LoggingFilterSwitch support
+* #202 - added support to AuditTo.Logger
+* #203 - added support for custom types in arrays and custom collections
+* #218 - fixed an issue with `dotnet restore` with `rid` specified if referenced from `netstandard` project
+* #219 - reduced search graph for configuration dlls to avoid native assets
+* #221 - added support for conditional/leveled enrichers from Serilog 2.9+
+* #222 - updated Microsoft.Extensions.DependencyModel
+* #231 - make '$' sign optional for minimum level / filter switch declarations
+* #237 - DependencyContextAssemblyFinder fix: check `serilog` at the start of the name for any dependent package
+* #239 - handle NotSupportedException for .net 5.0 single file applications
+* #260 - skip static constructor on binding for complex parameters types
+
+3.1.0
+
+* #155 - improve SelfLog output when misconfigured
+* #160 - respect dynamic logging level changes for LevelSwitch section
+* #158 - update NuGet package license format to new format
+* #159 - DllScanningAssemblyFinder fixes #157, #150, #122, #156
+* #161 - support simple type names for Serilog types
+* #151 - no longer rely on static state in ConfigurationReader
+* #179 - added missing null checks for settingConfiguration
+* #163 - added new ReadFrom.Configuration(...) overloads; marked old as obsolete
+* #176 - added test to show how to filter child contexts
+
+3.0.1
+
+* #142 - Fix IConfiguration parameters not being populated
+* #143 - Fix ReadFrom.ConfigurationSection() looking for sections below a root Serilog section
+
+3.0.0
+
+* #91 & #92 - Fix cherrypick from master
+* #97 - Support of IConfiguration parameters & IConfigurationSection parameters
+* #83 - Updated dependencies of Microsoft.Extensions.DependencyModel,
+   Microsoft.Extensions.Configuration.Abstraction & Microsoft.Extensions.Options.ConfigurationExtensions per TFM
+* #98 - specify string array params
+* Target Framework change to netcoreapp2.0
+* Build updates including addition of Travis Build
+* #105 - detect and fail on ambiguous configurations
+* #110 - destructure support
+* #111 - case-insensitive argument matching
+* #132 - choose string overloads to resolve binding ambiguities
+* #134 - specify repository URL in package
+* #124 - build a .NET 4.6.1 target
+* #136 - control assembly source
+* #138 - remove unnecessary package ref
+* #139 - remove unused class
+* #140 - expand support for destructure/enrich/filter configuration
+
+2.6.1
+
+* #92 - fix WriteTo.Logger handling
+
+2.6.0
+
+* #67 - improve error reporting when trying to convert from a missing class
+* #74 - support abstract classes (in addition to interfaces) as values
+* #84 - (documentation update)
+* #88 - LoggingLevelSwitch support
+
+2.4.0
+
+* #46 - configure sub-loggers through JSON settings
+* #48 - permit multiple sinks of the same kind
+
+2.3.1
+
+* #44 - fix ReadFrom.Configuration() on AWS Lambda; VS 2017 tooling
+
+2.3.0
+
+* #40 - fix loading of configuration assemblies with names differing from their packages
+* #36 - "Filter" support
+
+2.2.0
+
+* #20 - support MSBuild (non-project.json) projects
+
 2.1.0
- * #14 - MinimumLevel.Override()
- * #15 - Overload selection fix
+
+* #14 - MinimumLevel.Override()
+* #15 - Overload selection fix
 
 2.0.0
- * Initial version
- 
+
+* Initial version
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <TreatSpecificWarningsAsErrors />
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
+  </ItemGroup>
+</Project>