Skip to content

Commit f6a8ffe

Browse files
committed
Release 1.0
1 parent 5324bd9 commit f6a8ffe

File tree

5 files changed

+33
-20
lines changed

5 files changed

+33
-20
lines changed

Build.ps1

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@ Push-Location $PSScriptRoot
22

33
if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse }
44

5-
& dotnet restore
5+
& dotnet restore --no-cache
66

7-
$revision = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
7+
$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
8+
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
9+
$suffix = @{ $true = ""; $false = "$branch-$revision"}[$branch -eq "master" -and $revision -ne "local"]
810

9-
Push-Location src/Serilog.Formatting.Compact
11+
foreach ($src in ls src/Serilog.*) {
12+
Push-Location $src
1013

11-
& dotnet pack -c Release -o ..\..\.\artifacts --version-suffix=$revision
12-
if($LASTEXITCODE -ne 0) { exit 1 }
14+
& dotnet pack -c Release -o ..\..\.\artifacts --version-suffix=$suffix
15+
if($LASTEXITCODE -ne 0) { exit 1 }
1316

14-
Pop-Location
15-
Push-Location test/Serilog.Formatting.Compact.Tests
17+
Pop-Location
18+
}
1619

17-
& dotnet test -c Release
18-
if($LASTEXITCODE -ne 0) { exit 2 }
20+
foreach ($test in ls test/Serilog.*.Tests) {
21+
Push-Location $test
22+
23+
& dotnet test -c Release
24+
if($LASTEXITCODE -ne 0) { exit 2 }
25+
26+
Pop-Location
27+
}
1928

20-
Pop-Location
2129
Pop-Location

appveyor.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
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-preview3-003161'
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
1213
test: off
1314
artifacts:
1415
- path: artifacts/Serilog.*.nupkg
15-
- path: BenchmarkDotNet.Artifacts\results\**\*
16-
name: benchmark-results
1716
deploy:
1817
- provider: NuGet
1918
api_key:
2019
secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
2120
skip_symbols: true
2221
on:
23-
branch: /^(dev|master)$/
24-
22+
branch: /^(master|dev)$/
23+
- provider: GitHub
24+
auth_token:
25+
secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
26+
artifact: /Serilog.*\.nupkg/
27+
tag: v$(appveyor_build_version)
28+
on:
29+
branch: master

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.0-preview3-003161"
4+
"version": "1.0.0-preview2-003121"
55
}
66
}

src/Serilog.Formatting.Compact/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0-rc-*",
2+
"version": "1.0.0-*",
33
"description": "A simple, compact JSON-based event format for Serilog.",
44
"authors": [ "Serilog Contributors" ],
55
"packOptions": {
@@ -9,7 +9,7 @@
99
"iconUrl": "http://serilog.net/images/serilog-community-nuget.png"
1010
},
1111
"dependencies": {
12-
"Serilog": "2.0.0-rc-633"
12+
"Serilog": "2.0.0"
1313
},
1414
"buildOptions": {
1515
"keyFile": "../../assets/Serilog.snk",

test/Serilog.Formatting.Compact.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"keyFile": "../../assets/Serilog.snk"
1212
},
1313
"frameworks": {
14-
"net4.5.2": {},
14+
"net4.5.2": {},
1515
"netcoreapp1.0": {
1616
"dependencies": {
1717
"Microsoft.NETCore.App": {

0 commit comments

Comments
 (0)