Skip to content

Commit

Permalink
Merge pull request #3 from merbla/2.0-release
Browse files Browse the repository at this point in the history
Changes for 2.0 Release.
  • Loading branch information
nblumhardt authored Jun 29, 2016
2 parents 1faf996 + ebd625d commit 0c5f924
Show file tree
Hide file tree
Showing 6 changed files with 339 additions and 8 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ The environment enricher for Serilog.

[![Build status](https://ci.appveyor.com/api/projects/status/yfbvbdxd5vwh6955?svg=true)](https://ci.appveyor.com/project/serilog/serilog-enrichers-environment) [![NuGet Version](http://img.shields.io/nuget/v/Serilog.Enrichers.Environment.svg?style=flat)](https://www.nuget.org/packages/Serilog.Enrichers.Environment/)


To use the enricher, first install the NuGet package:

```powershell
Install-Package Serilog.Enrichers.Environment
```

* [Documentation](https://github.com/serilog/serilog/wiki)

Copyright © 2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html).
15 changes: 11 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
version: '{build}'
skip_tags: true
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/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/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.0-preview2-002823'
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
- ps: ./Build.ps1
Expand All @@ -18,5 +19,11 @@ deploy:
secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
skip_symbols: true
on:
branch: /^(dev|master)$/

branch: /^(master)$/
- provider: GitHub
auth_token:
secure: ggZTqqV1z0xecDoQbeoy3A7xikShCt9FWZIGp95dG9Fo0p5RAT9oGU0ZekHfUIwk
artifact: /Serilog.*\.nupkg/
tag: v$(appveyor_build_version)
on:
branch: master
12 changes: 12 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
dotnet restore
for path in src/*/project.json; do
dirname="$(dirname "${path}")"
dotnet build ${dirname} -c Release
done

dotnet restore
for path in test/*/project.json; do
dirname="$(dirname "${path}")"
dotnet build ${dirname} -c Release
done
6 changes: 3 additions & 3 deletions src/Serilog.Enrichers.Environment/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.0.0-rc-*",
"version": "2.0.0",
"description": "Enrich Serilog log events with properties from System.Environment.",
"authors": [
"Serilog Contributors"
Expand All @@ -15,7 +15,7 @@
"iconUrl": "http://serilog.net/images/serilog-enricher-nuget.png"
},
"dependencies": {
"Serilog": "2.0.0-rc-556"
"Serilog": "2.0.0"
},
"buildOptions": {
"keyFile": "../../assets/Serilog.snk"
Expand All @@ -27,7 +27,7 @@
},
"netstandard1.5": {
"dependencies": {
"System.Runtime.Extensions": "4.1.0-rc2-24027"
"System.Runtime.Extensions": "4.1.0"
}
}
}
Expand Down
Loading

0 comments on commit 0c5f924

Please sign in to comment.