Merge pull request #21 from serilog/dev

3.0.0 Release

Build.ps1

@@ -20,7 +20,7 @@ foreach ($src in ls src/*) {
 
 	echo "build: Packaging project in $src"
 
-    & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
+    & dotnet pack -c Release --include-symbols  -o ..\..\artifacts --version-suffix=$suffix
     if($LASTEXITCODE -ne 0) { exit 1 }    
 
     Pop-Location

README.md

@@ -4,6 +4,10 @@ An alternative colored console sink for Serilog that uses a [literate programmin
 
 ![Screenshot](https://raw.githubusercontent.com/serilog/serilog-sinks-literate/dev/assets/Screenshot.png)
 
+### This package is being retired
+
+The features of this sink have now been merged into the default Serilog console sink. We recommend using [the console sink](https://github.com/serilog/serilog-sinks-console) instead.
+
 ### Getting started
 
 Install the [Serilog.Sinks.Literate](https://nuget.org/packages/serilog.sinks.literate) package from NuGet:
@@ -24,7 +28,7 @@ Log.Information("This will be written to the literate console");
 
 ### XML `<appSettings>` configuration
 
-To use the rolling file sink with the [Serilog.Settings.AppSettings](https://github.com/serilog/serilog-settings-appsettings) package, first install that package if you haven't already done so:
+To use the literate console sink with the [Serilog.Settings.AppSettings](https://github.com/serilog/serilog-settings-appsettings) package, first install that package if you haven't already done so:
 
 ```powershell
 Install-Package Serilog.Settings.AppSettings

appveyor.yml

@@ -4,9 +4,9 @@ image: Visual Studio 2015
 configuration: Release
 install:
   - ps: mkdir -Force ".\build\" | Out-Null
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
+  - ps: Invoke-WebRequest "https://dot.net/v1/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.0-preview2-003121'
+  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.3'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
 - ps: ./Build.ps1

global.json

@@ -1,6 +1,5 @@
 {
-  "projects": [ "src", "test", "sample" ],
   "sdk": {
-    "version": "1.0.0-preview2-003121"
+    "version": "1.0.3"
   }
-}
+}

sample/LiterateConsoleDemo/LiterateConsoleDemo.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Serilog.Sinks.Literate\Serilog.Sinks.Literate.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+
+</Project>

serilog-sinks-literate.sln

@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Literate", "src\Serilog.Sinks.Literate\Serilog.Sinks.Literate.xproj", "{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{AF3311F5-E7EC-42CC-AF56-1DDFBCDD1180}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
@@ -18,37 +16,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1036AE72-6B5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5AB86B48-9C2B-47EC-9F51-3356B196C185}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Literate.Tests", "test\Serilog.Sinks.Literate.Tests\Serilog.Sinks.Literate.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{84987FC9-EF9C-4E70-BD0B-3BA9605C922A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LiterateConsoleDemo", "sample\LiterateConsoleDemo\LiterateConsoleDemo.xproj", "{1DDBF7E3-2CE3-40E0-9238-9B1ED9EFB90B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Literate", "src\Serilog.Sinks.Literate\Serilog.Sinks.Literate.csproj", "{669B7CE1-1F79-4D66-8BF9-211976541B00}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Literate.Tests", "test\Serilog.Sinks.Literate.Tests\Serilog.Sinks.Literate.Tests.csproj", "{A4573B01-09DA-482F-ACCB-310680750A08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiterateConsoleDemo", "sample\LiterateConsoleDemo\LiterateConsoleDemo.csproj", "{49C5857A-B6E3-483E-B780-F9F2FE184809}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1DDBF7E3-2CE3-40E0-9238-9B1ED9EFB90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DDBF7E3-2CE3-40E0-9238-9B1ED9EFB90B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DDBF7E3-2CE3-40E0-9238-9B1ED9EFB90B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1DDBF7E3-2CE3-40E0-9238-9B1ED9EFB90B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{669B7CE1-1F79-4D66-8BF9-211976541B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{669B7CE1-1F79-4D66-8BF9-211976541B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{669B7CE1-1F79-4D66-8BF9-211976541B00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{669B7CE1-1F79-4D66-8BF9-211976541B00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4573B01-09DA-482F-ACCB-310680750A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4573B01-09DA-482F-ACCB-310680750A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4573B01-09DA-482F-ACCB-310680750A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4573B01-09DA-482F-ACCB-310680750A08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49C5857A-B6E3-483E-B780-F9F2FE184809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49C5857A-B6E3-483E-B780-F9F2FE184809}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49C5857A-B6E3-483E-B780-F9F2FE184809}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49C5857A-B6E3-483E-B780-F9F2FE184809}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D8A74F4C-981B-41F1-B807-FE08DFCC06D4} = {1036AE72-6B5B-40F3-A838-D6B3628B20C7}
-		{3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {5AB86B48-9C2B-47EC-9F51-3356B196C185}
-		{1DDBF7E3-2CE3-40E0-9238-9B1ED9EFB90B} = {84987FC9-EF9C-4E70-BD0B-3BA9605C922A}
+		{669B7CE1-1F79-4D66-8BF9-211976541B00} = {1036AE72-6B5B-40F3-A838-D6B3628B20C7}
+		{A4573B01-09DA-482F-ACCB-310680750A08} = {5AB86B48-9C2B-47EC-9F51-3356B196C185}
+		{49C5857A-B6E3-483E-B780-F9F2FE184809} = {84987FC9-EF9C-4E70-BD0B-3BA9605C922A}
 	EndGlobalSection
 EndGlobal

src/Serilog.Sinks.Literate/LoggerConfigurationLiterateExtensions.cs

@@ -15,7 +15,7 @@
 using System;
 using Serilog.Configuration;
 using Serilog.Events;
-using Serilog.Sinks.Literate;
+using Serilog.Sinks.SystemConsole.Themes;
 
 namespace Serilog
 {
@@ -24,7 +24,7 @@ namespace Serilog
     /// </summary>
     public static class LoggerConfigurationLiterateExtensions
     {
-        const string DefaultOutputTemplate = "[{Timestamp:HH:mm:ss} {Level:u3}] {Message}{NewLine}{Exception}";
+        const string DefaultOutputTemplate = "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:l}{NewLine}{Exception}";
 
         /// <summary>
         /// Writes log events to <see cref="System.Console"/>, using pretty printing to display inline event data.
@@ -46,7 +46,12 @@ public static LoggerConfiguration LiterateConsole(
         {
             if (sinkConfiguration == null) throw new ArgumentNullException(nameof(sinkConfiguration));
             if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
-            return sinkConfiguration.Sink(new LiterateConsoleSink(outputTemplate, formatProvider, standardErrorFromLevel), restrictedToMinimumLevel);
+            return sinkConfiguration.Console(
+                outputTemplate: outputTemplate,
+                formatProvider: formatProvider,
+                standardErrorFromLevel: standardErrorFromLevel, 
+                theme: SystemConsoleTheme.Literate,
+                restrictedToMinimumLevel: restrictedToMinimumLevel);
         }
     }
 }

src/Serilog.Sinks.Literate/Serilog.Sinks.Literate.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Now replaced by Serilog.Sinks.Console, please use that package instead. An alternative colored console sink for Serilog that pretty-prints properties.</Description>
+    <AssemblyVersion>3.0.0</AssemblyVersion>
+    <RootNamespace>Serilog</RootNamespace>
+    <VersionPrefix>3.0.0</VersionPrefix>
+    <Authors>Serilog Contributors</Authors>
+    <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Serilog.Sinks.Literate</AssemblyName>
+    <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageId>Serilog.Sinks.Literate</PackageId>
+    <PackageTags>serilog;literate;logging</PackageTags>
+    <PackageIconUrl>http://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/serilog/serilog-sinks-literate</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+     <!-- Don't reference the full NETStandard.Library -->
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>   
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
+  </ItemGroup>
+
+</Project>