Merge pull request #94 from merbla/tooling-updates

Build/tooling updates

Author: nblumhardt

.gitignore

@@ -196,3 +196,6 @@ FakesAssemblies/
 *.opt
 
 project.lock.json
+
+#Test files
+*.txt

.travis.yml

@@ -0,0 +1,11 @@
+language: csharp
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      dotnet: 2.1.4
+      group: edge
+script:
+  - ./build.sh

appveyor.yml

@@ -2,12 +2,6 @@ version: '{build}'
 skip_tags: true
 image: Visual Studio 2017
 configuration: Release
-install:
-  - ps: mkdir -Force ".\build\" | Out-Null
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
-  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
-  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.1'
-  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
 - ps: ./Build.ps1
 test: off

build.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e 
+dotnet --info
+dotnet restore
+
+for path in src/**/*.csproj; do
+    dotnet build -f netstandard1.6 -c Release ${path}
+done
+
+for path in test/*.Tests/*.csproj; do
+    dotnet test -f netcoreapp2.0  -c Release ${path}
+done
+
+cd sample/Sample/
+dotnet build -f netcoreapp2.0 -c Release 
+dotnet bin/Release/netcoreapp2.0/Sample.dll --run-once

sample/Sample/Program.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using Serilog;
 using System.IO;
-
+using System.Linq;
 using Serilog.Core;
 using Serilog.Events;
 
@@ -22,6 +22,8 @@ public static void Main(string[] args)
                 .ReadFrom.Configuration(configuration)
                 .CreateLogger();
 
+            logger.Information("Args: {a}", args);
+
             do
             {
                 logger.ForContext<Program>().Information("Hello, world!");
@@ -32,7 +34,7 @@ public static void Main(string[] args)
 
                 Console.WriteLine();
             }
-            while (Console.ReadKey().KeyChar != 'q');
+            while (!args.Contains("--run-once") && (Console.ReadKey().KeyChar != 'q'));
         }
     }
 

sample/Sample/Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
@@ -23,4 +23,10 @@
     <PackageReference Include="Serilog.Filters.Expressions" Version="1.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

sample/Sample/appsettings.json

@@ -17,7 +17,7 @@
               "Name": "Console",
               "Args": {
                 "outputTemplate": "[{Timestamp:HH:mm:ss} {SourceContext} [{Level}] {Message}{NewLine}{Exception}",
-                "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console"
+                "theme": "Serilog.Sinks.SystemConsole.Themes.SystemConsoleTheme::Grayscale, Serilog.Sinks.Console"
               }
             }
           ]
@@ -58,4 +58,4 @@
       }
     ]
   }
-}
+}

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

@@ -329,7 +329,7 @@ internal static IList<MethodInfo> FindSinkConfigurationMethods(IReadOnlyCollecti
         {
             var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerSinkConfiguration));
             if (configurationAssemblies.Contains(typeof(LoggerSinkConfiguration).GetTypeInfo().Assembly))
-                found.Add(GetSurrogateConfigurationMethod<LoggerSinkConfiguration, Action<LoggerConfiguration>, LoggingLevelSwitch>((c, a, s) => Logger(c, a, s)));
+                found.Add(GetSurrogateConfigurationMethod<LoggerSinkConfiguration, Action<LoggerConfiguration>, LoggingLevelSwitch>((c, a, s) => Logger(c, a, LevelAlias.Minimum, s)));
 
             return found;
         }
@@ -380,8 +380,12 @@ internal static LoggerConfiguration FromLogContext(LoggerEnrichmentConfiguration
             => loggerEnrichmentConfiguration.FromLogContext();
 
         // Unlike the other configuration methods, Logger is an instance method rather than an extension.
-        internal static LoggerConfiguration Logger(LoggerSinkConfiguration loggerSinkConfiguration, Action<LoggerConfiguration> configureLogger, LoggingLevelSwitch restrictedToMinimumLevel = null)
-            => loggerSinkConfiguration.Logger(configureLogger, levelSwitch: restrictedToMinimumLevel);
+        internal static LoggerConfiguration Logger(
+            LoggerSinkConfiguration loggerSinkConfiguration,
+            Action<LoggerConfiguration> configureLogger,
+            LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+            LoggingLevelSwitch levelSwitch = null)
+            => loggerSinkConfiguration.Logger(configureLogger, restrictedToMinimumLevel, levelSwitch);
 
         internal static MethodInfo GetSurrogateConfigurationMethod<TConfiguration, TArg1, TArg2>(Expression<Action<TConfiguration, TArg1, TArg2>> method)
             => (method.Body as MethodCallExpression)?.Method;

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationValueSyntax.cs

@@ -0,0 +1,14 @@
+using System.Text.RegularExpressions;
+
+namespace Serilog.Settings.Configuration
+{
+    static class ConfigurationValueSyntax
+    {
+        const string LevelSwitchNameRegex = @"^\$[A-Za-z]+[A-Za-z0-9]*$";
+
+        public static bool IsValidSwitchName(string input)
+        {
+            return Regex.IsMatch(input, LevelSwitchNameRegex);
+        }
+    }
+}

test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs

@@ -390,5 +390,73 @@ public void LoggingLevelSwitchCanBeUsedForMinimumLevelOverrides()
             Assert.False(evt is null, "LoggingLevelSwitch level was changed to Information for logger System.*. It should now log Information events for SourceContext System.Bar.");
             // ReSharper restore HeuristicUnreachableCode
         }
+
+
+        [Trait("Bugfix", "#91")]
+        [Fact]
+        public void WriteToLoggerWithRestrictedToMinimumLevelIsSupported()
+        {
+            var json = @"{
+            ""Serilog"": {            
+                ""Using"": [""TestDummies""],
+                ""WriteTo"": [{
+                    ""Name"": ""Logger"",
+                    ""Args"": {
+                        ""configureLogger"" : {
+                            ""WriteTo"": [{
+                                ""Name"": ""DummyRollingFile"",
+                                ""Args"": {""pathFormat"" : ""C:\\""}
+                            }]},
+                        ""restrictedToMinimumLevel"": ""Warning"" 
+                    }
+                }]        
+            }
+            }";
+
+            var log = ConfigFromJson(json)
+            .CreateLogger();
+
+            DummyRollingFileSink.Emitted.Clear();
+
+            log.Write(Some.InformationEvent());
+            log.Write(Some.WarningEvent());
+
+            Assert.Equal(1, DummyRollingFileSink.Emitted.Count);
+        }
+
+        [Trait("Bugfix", "#91")]
+        [Fact]
+        public void WriteToSubLoggerWithLevelSwitchIsSupported()
+        {
+            var json = @"{
+            ""Serilog"": {            
+                ""Using"": [""TestDummies""],
+                ""LevelSwitches"": {""$switch1"" : ""Warning"" },          
+                ""MinimumLevel"" : {
+                        ""ControlledBy"" : ""$switch1""
+                    },
+                ""WriteTo"": [{
+                    ""Name"": ""Logger"",
+                    ""Args"": {
+                        ""configureLogger"" : {
+                            ""WriteTo"": [{
+                                ""Name"": ""DummyRollingFile"",
+                                ""Args"": {""pathFormat"" : ""C:\\""}
+                            }]}
+                    }
+                }]        
+            }
+            }";            
+             
+            var log = ConfigFromJson(json)
+            .CreateLogger();
+
+            DummyRollingFileSink.Emitted.Clear();
+
+            log.Write(Some.InformationEvent());
+            log.Write(Some.WarningEvent());
+
+            Assert.Equal(1, DummyRollingFileSink.Emitted.Count);
+        }
     }
 }

test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Serilog.Settings.Configuration.Tests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

test/TestDummies/TestDummies.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
     <AssemblyName>TestDummies</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>