Merge pull request #299 from serilog/dev

3.4.0 Release

Author: nblumhardt

Build.ps1

@@ -2,72 +2,59 @@ 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 "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 dir src/*) {
+foreach ($src in gci 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 -p:ContinuousIntegrationBuild=true
-    if ($LASTEXITCODE -ne 0) { exit 1 }
+    & dotnet build -c Release --version-suffix=$buildSuffix
 
-    Pop-Location
-}
-
-foreach ($test in dir test/*.PerformanceTests) {
-    Push-Location $test
-
-    echo "build: Building performance test project in $test"
-
-    & dotnet build -c Release
-    if ($LASTEXITCODE -ne 0) { exit 2 }
+    if($suffix) {
+        & dotnet pack -c Release --include-source --no-build -o ../../artifacts --version-suffix=$suffix  -p:ContinuousIntegrationBuild=true
+    } else {
+        & dotnet pack -c Release --include-source --no-build -o ../../artifacts  -p:ContinuousIntegrationBuild=true
+    }
+    if($LASTEXITCODE -ne 0) { exit 1 }
 
     Pop-Location
 }
 
-foreach ($test in dir test/*.Tests) {
+foreach ($test in gci test/*.Tests) {
     Push-Location $test
 
-    echo "build: Testing project in $test"
-
-    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
-    }
+	echo "build: Testing project in $test"
 
-    if ($LASTEXITCODE -ne 0) { exit 3 }
+    & 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 }
+foreach ($test in gci test/*.PerformanceTests) {
+    Push-Location $test
 
-    & dotnet run -f netcoreapp3.1 -c Release --run-once
-    if ($LASTEXITCODE -ne 0) { exit 4 }
+	echo "build: Building performance test project in $test"
 
-    & dotnet run -f net50         -c Release --run-once
-    if ($LASTEXITCODE -ne 0) { exit 4 }
+    & dotnet build -c Release
+    if($LASTEXITCODE -ne 0) { exit 2 }
 
     Pop-Location
 }
 
-Pop-Location
+Pop-Location

CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+3.3.1
+
+* #287 - Fix static member access for concrete type parameters
+
 3.3.0
 
 * #276, #225, #167 - added support for constructors with arguments for complex types

Directory.Build.props

@@ -6,6 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
   </ItemGroup>
 </Project>

README.md

@@ -111,13 +111,26 @@ var logger = new LoggerConfiguration()
     .CreateLogger();
 ```
 
+Alternatively, you can also pass an array of configuration assemblies:
+
+```csharp
+var configurationAssemblies = new[]
+{
+    typeof(ConsoleLoggerConfigurationExtensions).Assembly,
+    typeof(FileLoggerConfigurationExtensions).Assembly,
+};
+var logger = new LoggerConfiguration()
+    .ReadFrom.Configuration(configuration, configurationAssemblies)
+    .CreateLogger();
+```
+
 For legacy .NET Framework projects it also scans default probing path(s).
 
 For all other cases, as well as in the case of non-conventional configuration assembly names **DO** use [Using](#using-section-and-auto-discovery-of-configuration-assemblies) section.
 
-#### .NET 5.0 Single File Applications
+#### .NET 5.0 onwards Single File Applications
 
-Currently, auto-discovery of configuration assemblies is not supported in bundled mode. **DO** use [Using](#using-section-and-auto-discovery-of-configuration-assemblies) section for workaround.
+Currently, auto-discovery of configuration assemblies is not supported in bundled mode. **DO** use [Using](#using-section-and-auto-discovery-of-configuration-assemblies) section or explicitly pass a collection of configuration assemblies for workaround.
 
 ### MinimumLevel, LevelSwitches, overrides and dynamic reload
 

appveyor.yml

@@ -1,34 +1,37 @@
 version: '{build}'
+
 skip_tags: true
+
 image:
-  - Visual Studio 2019
+  - Visual Studio 2022
   - Ubuntu
-configuration: Release
+
 build_script:
-- ps: ./Build.ps1
-for:
--
-  matrix:
-    only:
-      - image: Ubuntu
-  build_script:
-  - pwsh ./Build.ps1
+- pwsh: ./Build.ps1
+
 test: off
+
 artifacts:
 - path: artifacts/Serilog.*.nupkg
 - path: artifacts/Serilog.*.snupkg
-deploy:
-- provider: NuGet
-  api_key:
-    secure: 6WetFj2k7TEactDaHhg0m0q/WpCldFAUtgAjN8VK9Qn2fsY1vdufRB8XIKnPX9zn
-  on:
-    branch: /^(main|dev)$/
-- provider: GitHub
-  auth_token:
-    secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
-  artifacts:
-    /Serilog.*\.nupkg/
-    /Serilog.*\.snupkg/
-  tag: v$(appveyor_build_version)
-  on:
-    branch: main
+
+for:
+-
+  matrix:
+    only:
+      - image: Visual Studio
+  deploy:
+  - provider: NuGet
+    api_key:
+      secure: 60gpLnipFCiKLpS7ECI1C6EPJW27KzVwqrBVkEzX6FIMTmsG//HD3p8Oq7WdQPm8
+    on:
+      branch: /^(main|dev)$/
+  - provider: GitHub
+    auth_token:
+      secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
+    artifacts:
+      /Serilog.*\.nupkg/
+      /Serilog.*\.snupkg/
+    tag: v$(appveyor_build_version)
+    on:
+      branch: main

sample/Sample/Program.cs

@@ -12,6 +12,8 @@
 using Serilog.Events;
 using Serilog.Debugging;
 
+// ReSharper disable UnusedType.Global
+
 namespace Sample
 {
     public class Program
@@ -31,7 +33,7 @@ public static void Main(string[] args)
                 .ReadFrom.Configuration(configuration)
                 .CreateLogger();
 
-            logger.Information("Args: {a}", args);
+            logger.Information("Args: {Args}", args);
 
             do
             {
@@ -79,6 +81,7 @@ public bool IsEnabled(LogEvent logEvent)
     public class LoginData
     {
         public string Username;
+        // ReSharper disable once NotAccessedField.Global
         public string Password;
     }
 
@@ -88,12 +91,12 @@ public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyV
         {
             result = null;
 
-            if (value is LoginData)
+            if (value is LoginData loginData)
             {
                 result = new StructureValue(
                     new List<LogEventProperty>
                     {
-                        new LogEventProperty("Username", new ScalarValue(((LoginData)value).Username))
+                        new("Username", new ScalarValue(loginData.Username))
                     });
             }
 

sample/Sample/Sample.csproj

@@ -1,43 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50;netcoreapp3.1;netcoreapp2.1;net46</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PreserveCompilationContext>false</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Settings.Configuration\Serilog.Settings.Configuration.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
-    <PackageReference Include="Serilog.Filters.Expressions" Version="2.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Serilog.Filters.Expressions" Version="2.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.10" />
-    <PackageReference Include="Serilog.Expressions" Version="1.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net50'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Serilog.Expressions" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
+    <PackageReference Include="Serilog.Expressions" Version="3.3.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
   </ItemGroup>

serilog-settings-configuration.sln.DotSettings

@@ -556,4 +556,6 @@ II.2.12 <HandlesEvent />
 
 
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
-	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Enricher/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=polyfilled/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Serilog.Settings.Configuration/ConfigurationLoggerConfigurationExtensions.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using System;
+using System.Reflection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyModel;
 using Serilog.Configuration;
@@ -116,7 +117,7 @@ public static LoggerConfiguration ConfigurationSection(
         /// <param name="settingConfiguration">Logger setting configuration.</param>
         /// <param name="configuration">A configuration object which contains a Serilog section.</param>
         /// <param name="sectionName">A section name for section which contains a Serilog section.</param>
-        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other Types.</param>
+        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other types.</param>
         /// <returns>An object allowing configuration to continue.</returns>
         public static LoggerConfiguration Configuration(
             this LoggerSettingsConfiguration settingConfiguration,
@@ -140,7 +141,7 @@ public static LoggerConfiguration Configuration(
         /// </summary>
         /// <param name="settingConfiguration">Logger setting configuration.</param>
         /// <param name="configuration">A configuration object which contains a Serilog section.</param>
-        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other Types.</param>
+        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other types.</param>
         /// <returns>An object allowing configuration to continue.</returns>
         public static LoggerConfiguration Configuration(
             this LoggerSettingsConfiguration settingConfiguration,
@@ -154,7 +155,7 @@ public static LoggerConfiguration Configuration(
         /// </summary>
         /// <param name="settingConfiguration">Logger setting configuration.</param>
         /// <param name="configSection">The Serilog configuration section</param>
-        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other Types.</param>
+        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other types.</param>
         /// <returns>An object allowing configuration to continue.</returns>
         [Obsolete("Use ReadFrom.Configuration(IConfiguration configuration, string sectionName, ConfigurationAssemblySource configurationAssemblySource) instead.")]
         public static LoggerConfiguration ConfigurationSection(
@@ -169,5 +170,39 @@ public static LoggerConfiguration ConfigurationSection(
 
             return settingConfiguration.Settings(new ConfigurationReader(configSection, assemblyFinder, configuration: null));
         }
+
+        /// <summary>
+        /// Reads logger settings from the provided configuration object using the provided section name.
+        /// </summary>
+        /// <param name="settingConfiguration">Logger setting configuration.</param>
+        /// <param name="configuration">A configuration object which contains a Serilog section.</param>
+        /// <param name="sectionName">A section name for section which contains a Serilog section.</param>
+        /// <param name="assemblies">A collection of assemblies that contains sinks and other types.</param>
+        /// <returns>An object allowing configuration to continue.</returns>
+        public static LoggerConfiguration Configuration(
+            this LoggerSettingsConfiguration settingConfiguration,
+            IConfiguration configuration,
+            string sectionName,
+            params Assembly[] assemblies)
+        {
+            if (settingConfiguration == null) throw new ArgumentNullException(nameof(settingConfiguration));
+            if (configuration == null) throw new ArgumentNullException(nameof(configuration));
+            if (sectionName == null) throw new ArgumentNullException(nameof(sectionName));
+
+            return settingConfiguration.Settings(new ConfigurationReader(configuration.GetSection(sectionName), assemblies, new ResolutionContext(configuration)));
+        }
+
+        /// <summary>
+        /// Reads logger settings from the provided configuration object using the default section name.
+        /// </summary>
+        /// <param name="settingConfiguration">Logger setting configuration.</param>
+        /// <param name="configuration">A configuration object which contains a Serilog section.</param>
+        /// <param name="assemblies">A collection of assemblies that contains sinks and other types.</param>
+        /// <returns>An object allowing configuration to continue.</returns>
+        public static LoggerConfiguration Configuration(
+            this LoggerSettingsConfiguration settingConfiguration,
+            IConfiguration configuration,
+            params Assembly[] assemblies)
+            => Configuration(settingConfiguration, configuration, DefaultSectionName, assemblies);
     }
 }