File tree Expand file tree Collapse file tree 5 files changed +33
-20
lines changed
src/Serilog.Formatting.Compact
test/Serilog.Formatting.Compact.Tests Expand file tree Collapse file tree 5 files changed +33
-20
lines changed Original file line number Diff line number Diff line change @@ -2,20 +2,28 @@ Push-Location $PSScriptRoot
2
2
3
3
if (Test-Path .\artifacts) { Remove-Item .\artifacts - Force - Recurse }
4
4
5
- & dotnet restore
5
+ & dotnet restore -- no - cache
6
6
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" ]
8
10
9
- Push-Location src/ Serilog.Formatting.Compact
11
+ foreach ($src in ls src/ Serilog.* ) {
12
+ Push-Location $src
10
13
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 }
13
16
14
- Pop-Location
15
- Push-Location test / Serilog.Formatting.Compact.Tests
17
+ Pop-Location
18
+ }
16
19
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
+ }
19
28
20
- Pop-Location
21
29
Pop-Location
Original file line number Diff line number Diff line change 1
1
version : ' {build}'
2
+ skip_tags : true
2
3
image : Visual Studio 2015
3
4
configuration : Release
4
5
install :
5
6
- 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"
7
8
- 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 '
9
10
- ps : $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
10
11
build_script :
11
12
- ps : ./Build.ps1
12
13
test : off
13
14
artifacts :
14
15
- path : artifacts/Serilog.*.nupkg
15
- - path : BenchmarkDotNet.Artifacts\results\**\*
16
- name : benchmark-results
17
16
deploy :
18
17
- provider : NuGet
19
18
api_key :
20
19
secure : nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
21
20
skip_symbols : true
22
21
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
Original file line number Diff line number Diff line change 1
1
{
2
2
"projects" : [ " src" , " test" ],
3
3
"sdk" : {
4
- "version" : " 1.0.0-preview3-003161 "
4
+ "version" : " 1.0.0-preview2-003121 "
5
5
}
6
6
}
Original file line number Diff line number Diff line change 1
1
{
2
- "version" : " 1.0.0-rc- *" ,
2
+ "version" : " 1.0.0-*" ,
3
3
"description" : " A simple, compact JSON-based event format for Serilog." ,
4
4
"authors" : [ " Serilog Contributors" ],
5
5
"packOptions" : {
9
9
"iconUrl" : " http://serilog.net/images/serilog-community-nuget.png"
10
10
},
11
11
"dependencies" : {
12
- "Serilog" : " 2.0.0-rc-633 "
12
+ "Serilog" : " 2.0.0"
13
13
},
14
14
"buildOptions" : {
15
15
"keyFile" : " ../../assets/Serilog.snk" ,
Original file line number Diff line number Diff line change 11
11
"keyFile" : " ../../assets/Serilog.snk"
12
12
},
13
13
"frameworks" : {
14
- "net4.5.2" : {},
14
+ "net4.5.2" : {},
15
15
"netcoreapp1.0" : {
16
16
"dependencies" : {
17
17
"Microsoft.NETCore.App" : {
You can’t perform that action at this time.
0 commit comments