Skip to content

Commit 0c5f924

Browse files
authored
Merge pull request #3 from merbla/2.0-release
Changes for 2.0 Release.
2 parents 1faf996 + ebd625d commit 0c5f924

File tree

6 files changed

+339
-8
lines changed

6 files changed

+339
-8
lines changed

Diff for: README.md

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ The environment enricher for Serilog.
44

55
[![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/)
66

7+
8+
To use the enricher, first install the NuGet package:
9+
10+
```powershell
11+
Install-Package Serilog.Enrichers.Environment
12+
```
13+
714
* [Documentation](https://github.com/serilog/serilog/wiki)
815

916
Copyright © 2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html).

Diff for: appveyor.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
version: '{build}'
2+
skip_tags: true
23
image: Visual Studio 2015
34
configuration: Release
45
install:
56
- ps: mkdir -Force ".\build\" | Out-Null
6-
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
7+
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
78
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
8-
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-002823'
9+
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
910
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1011
build_script:
1112
- ps: ./Build.ps1
@@ -18,5 +19,11 @@ deploy:
1819
secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
1920
skip_symbols: true
2021
on:
21-
branch: /^(dev|master)$/
22-
22+
branch: /^(master)$/
23+
- provider: GitHub
24+
auth_token:
25+
secure: ggZTqqV1z0xecDoQbeoy3A7xikShCt9FWZIGp95dG9Fo0p5RAT9oGU0ZekHfUIwk
26+
artifact: /Serilog.*\.nupkg/
27+
tag: v$(appveyor_build_version)
28+
on:
29+
branch: master

Diff for: build.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
dotnet restore
3+
for path in src/*/project.json; do
4+
dirname="$(dirname "${path}")"
5+
dotnet build ${dirname} -c Release
6+
done
7+
8+
dotnet restore
9+
for path in test/*/project.json; do
10+
dirname="$(dirname "${path}")"
11+
dotnet build ${dirname} -c Release
12+
done

Diff for: src/Serilog.Enrichers.Environment/project.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.0-rc-*",
2+
"version": "2.0.0",
33
"description": "Enrich Serilog log events with properties from System.Environment.",
44
"authors": [
55
"Serilog Contributors"
@@ -15,7 +15,7 @@
1515
"iconUrl": "http://serilog.net/images/serilog-enricher-nuget.png"
1616
},
1717
"dependencies": {
18-
"Serilog": "2.0.0-rc-556"
18+
"Serilog": "2.0.0"
1919
},
2020
"buildOptions": {
2121
"keyFile": "../../assets/Serilog.snk"
@@ -27,7 +27,7 @@
2727
},
2828
"netstandard1.5": {
2929
"dependencies": {
30-
"System.Runtime.Extensions": "4.1.0-rc2-24027"
30+
"System.Runtime.Extensions": "4.1.0"
3131
}
3232
}
3333
}

0 commit comments

Comments
 (0)