Skip to content

3.2.0 Release #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 57 commits into from
Aug 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
de409ba
FilterSwitches support
Jan 7, 2019
e3253b0
Dev version bump [skip ci]
nblumhardt Jun 2, 2019
18bcbf0
Clarify role of Microsoft.Extensions.Configuration.Json; resolves #181
nblumhardt Jun 3, 2019
71839b8
Wrap a (scrolly) long line [skip ci]
nblumhardt Jun 24, 2019
043df81
add support to AuditTo.Logger
Nov 21, 2019
0140f73
add unit test
almostchristian Nov 21, 2019
02d559c
Merge pull request #202 from almostchristian/support-auditto-logger
nblumhardt Nov 21, 2019
406fa3d
Add support for custom types in arrays and custom collections
sungam3r Dec 7, 2019
b4a47f4
revert csproj changes
sungam3r Mar 21, 2020
1d11672
icon + tests
sungam3r Mar 21, 2020
33f20bb
fix
sungam3r Mar 21, 2020
addaa41
Merge pull request #203 from sungam3r/collections-of-custom-types
Mar 25, 2020
f980383
NU1605 fix for .net core clients
May 10, 2020
e38d03e
Merge pull request #218 from skomis-mm/issue196
nblumhardt May 10, 2020
cc45629
Update NuGet.org key
nblumhardt May 10, 2020
cce4f90
Reduce auto discovery graph:
May 11, 2020
1e1869b
ci/cd adjustments:
May 11, 2020
0082852
remove global.json from sln
May 11, 2020
9309608
show meaningfull message for a missing interface/abstract parameter type
May 11, 2020
8bea591
Merge pull request #220 from skomis-mm/missingTypeMsg
May 11, 2020
a1d539a
optimize filter condition for DependencyContextAssemblyFinder
May 11, 2020
bd779e5
Merge pull request #219 from skomis-mm/reduceGraph
May 12, 2020
801d6d8
added support for conditional enrichment (Serilog 2.9+)
May 12, 2020
9814003
update Microsoft.Extensions.DependencyModel to v3
May 12, 2020
543d858
Merge pull request #222 from skomis-mm/updDepModel
May 13, 2020
e12105f
Merge branch 'dev' into conditionalEnrich
May 13, 2020
06f8c11
Merge pull request #221 from skomis-mm/conditionalEnrich
May 13, 2020
ff5df00
documentation update, VSCode assets added
May 20, 2020
f6d6023
removed quotes from headers
May 23, 2020
75bbbcc
Update CHANGES.md
May 23, 2020
0624f63
Merge pull request #223 from skomis-mm/docUpd
May 26, 2020
c66e787
Update README.md
ch1seL Nov 6, 2020
f0b1952
Merge pull request #240 from ch1seL/patch-2
nblumhardt Nov 6, 2020
5ac6a59
misc fixes:
Sep 20, 2020
42b14be
DependencyContextAssemblyFinder fix: yield packages with `serilog` na…
Nov 17, 2020
186b99d
merge from dev
Nov 17, 2020
dd75239
added Serilog.Expressions support
Nov 17, 2020
adb695e
fix ci failing
Nov 17, 2020
da6a7a2
changelog update
Nov 17, 2020
aff1d22
Merge pull request #241 from skomis-mm/discoveryFixes
nblumhardt Nov 20, 2020
1dea2ad
merge from dev
Nov 20, 2020
9af2f30
selflog message fix
Nov 20, 2020
07d7a8d
Merge pull request #162 from skomis-mm/filterswitch
nblumhardt Nov 23, 2020
bc533bd
make '$' sign optional for minimum level / filter switch declarations
Nov 23, 2020
759cf76
Merge pull request #242 from skomis-mm/switchNames
nblumhardt Nov 24, 2020
8d1e68a
README typo, missing "s" [skip ci]
nblumhardt Mar 7, 2021
bb9a890
Update README to show how environment-specific configuration files ar…
nblumhardt Mar 26, 2021
6a8fdb8
skip static constructor on binding for complex parameters types
Apr 29, 2021
b71a380
Merge pull request #263 from skomis-mm/cctor
nblumhardt May 3, 2021
1564727
Typo
sungam3r May 7, 2021
ca6a4a6
Merge pull request #264 from sungam3r/patch-1
skomis-mm May 7, 2021
c0e82b9
Update README.md
sungam3r May 11, 2021
b2033d7
Merge pull request #265 from sungam3r/patch-1
skomis-mm May 11, 2021
e369f88
Update README.md
macfarmw May 19, 2021
63b8d33
Merge pull request #266 from macfarmw/patch-1
skomis-mm May 19, 2021
d1baffd
Update appveyor.yml
nblumhardt Aug 11, 2021
60ed15e
Release from `main`
nblumhardt Aug 11, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,6 @@ FakesAssemblies/
project.lock.json

#Test files
*.txt
*.txt

artifacts/
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

33 changes: 33 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -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}"
}
]
}
42 changes: 42 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
52 changes: 37 additions & 15 deletions Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
91 changes: 87 additions & 4 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
Loading