-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from nblumhardt/great-console-unification
Grand Unified Console [WIP]
- Loading branch information
Showing
48 changed files
with
2,773 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,44 @@ | ||
| echo "build: Build started" | ||
|
|
||
| Push-Location $PSScriptRoot | ||
|
|
||
| if(Test-Path .\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-$revision"}[$branch -eq "master" -and $revision -ne "local"] | ||
| $suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"] | ||
| $commitHash = $(git rev-parse --short HEAD) | ||
| $buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""] | ||
|
|
||
| echo "build: Package version suffix is $suffix" | ||
| echo "build: Build version suffix is $buildSuffix" | ||
|
|
||
| foreach ($src in ls src/Serilog.*) { | ||
| foreach ($src in ls src/*) { | ||
| Push-Location $src | ||
|
|
||
| & dotnet pack -c Release -o ..\..\.\artifacts --version-suffix=$suffix | ||
| echo "build: Packaging project in $src" | ||
|
|
||
| & dotnet build -c Release --version-suffix=$buildSuffix | ||
| & dotnet pack -c Release --include-symbols -o ..\..\artifacts --version-suffix=$suffix --no-build | ||
| if($LASTEXITCODE -ne 0) { exit 1 } | ||
|
|
||
| Pop-Location | ||
| } | ||
|
|
||
| foreach ($test in ls test/Serilog.*.Tests) { | ||
| foreach ($test in ls test/*.Tests) { | ||
| Push-Location $test | ||
|
|
||
| echo "build: Testing project in $test" | ||
|
|
||
| & dotnet test -c Release | ||
| if($LASTEXITCODE -ne 0) { exit 2 } | ||
| if($LASTEXITCODE -ne 0) { exit 3 } | ||
|
|
||
| Pop-Location | ||
| } | ||
|
|
||
| Pop-Location | ||
| Pop-Location |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFrameworks>netcoreapp1.1;net45</TargetFrameworks> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.Sinks.Console\Serilog.Sinks.Console.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using Serilog; | ||
| using System; | ||
| using System.Threading; | ||
| using Serilog.Sinks.SystemConsole.Themes; | ||
|
|
||
| namespace ConsoleDemo | ||
| { | ||
| public class Program | ||
| { | ||
| public static void Main() | ||
| { | ||
| Log.Logger = new LoggerConfiguration() | ||
| .MinimumLevel.Verbose() | ||
| .WriteTo.Console(theme: AnsiConsoleTheme.Code) | ||
| .CreateLogger(); | ||
|
|
||
| try | ||
| { | ||
| Log.Debug("Getting started"); | ||
|
|
||
| Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId); | ||
|
|
||
| Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 }); | ||
|
|
||
| Fail(); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| Log.Error(e, "Something went wrong"); | ||
| } | ||
|
|
||
| Log.CloseAndFlush(); | ||
| } | ||
|
|
||
| static void Fail() | ||
| { | ||
| throw new DivideByZeroException(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Description>A Serilog sink that writes log events to the console/terminal.</Description> | ||
| <VersionPrefix>3.0.0</VersionPrefix> | ||
| <Authors>Serilog Contributors</Authors> | ||
| <TargetFrameworks>net45;netstandard1.3;netcoreapp1.1</TargetFrameworks> | ||
| <AssemblyName>Serilog.Sinks.Console</AssemblyName> | ||
| <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile> | ||
| <SignAssembly>true</SignAssembly> | ||
| <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> | ||
| <PackageId>Serilog.Sinks.Console</PackageId> | ||
| <PackageTags>serilog;console;terminal</PackageTags> | ||
| <PackageIconUrl>http://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl> | ||
| <PackageProjectUrl>https://github.com/serilog/serilog-sinks-console</PackageProjectUrl> | ||
| <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl> | ||
| <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute> | ||
| <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <!-- Don't reference the full NETStandard.Library --> | ||
| <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> | ||
| <TreatWarningsAsErrors>True</TreatWarningsAsErrors> | ||
| <TreatSpecificWarningsAsErrors /> | ||
| <RootNamespace>Serilog</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' "> | ||
| <DefineConstants>$(DefineConstants);PINVOKE</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> | ||
| <DefineConstants>$(DefineConstants);PINVOKE;RUNTIME_INFORMATION</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Serilog" Version="2.5.0-dev-00855" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net45' "> | ||
| <Reference Include="System" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> | ||
| <PackageReference Include="System.Console" Version="4.3.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> | ||
| <PackageReference Include="System.Console" Version="4.3.0" /> | ||
| <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" /> | ||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.