Skip to content

Commit b6fc3aa

Browse files
nblumhardtnblumhardt
authored
Merge pull request #10 from serilog/dev
3.0.0 Release
2 parents 5774b16 + 9482dd2 commit b6fc3aa

14 files changed

+73
-146
lines changed

Diff for: ‎Build.ps1

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if(Test-Path .\artifacts) {
1111

1212
$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
1313
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
14-
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"]
14+
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"]
1515

1616
echo "build: Version suffix is $suffix"
1717

@@ -20,7 +20,12 @@ foreach ($src in ls src/*) {
2020

2121
echo "build: Packaging project in $src"
2222

23-
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
23+
if ($suffix) {
24+
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --include-source
25+
} else {
26+
& dotnet pack -c Release -o ..\..\artifacts --include-source
27+
}
28+
2429
if($LASTEXITCODE -ne 0) { exit 1 }
2530

2631
Pop-Location

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ var log = new LoggerConfiguration()
1010

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

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

Diff for: ‎appveyor.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
version: '{build}'
22
skip_tags: true
3-
image: Visual Studio 2015
3+
image: Visual Studio 2019
44
configuration: Release
5-
install:
6-
- ps: mkdir -Force ".\build\" | Out-Null
7-
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
8-
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
9-
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
10-
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
5+
test: off
116
build_script:
127
- ps: ./Build.ps1
13-
test: off
148
artifacts:
159
- path: artifacts/Serilog.*.nupkg
1610
deploy:
1711
- provider: NuGet
1812
api_key:
19-
secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
13+
secure: rbdBqxBpLt4MkB+mrDOYNDOd8aVZ1zMkysaVNAXNKnC41FYifzX3l9LM8DCrUWU5
2014
skip_symbols: true
2115
on:
22-
branch: /^(master|dev)$/
16+
branch: /^(main|dev)$/
2317
- provider: GitHub
2418
auth_token:
2519
secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
2620
artifact: /Serilog.*\.nupkg/
2721
tag: v$(appveyor_build_version)
2822
on:
29-
branch: master
23+
branch: main

Diff for: ‎assets/serilog-sink-nuget.png

20.4 KB
Loading

Diff for: ‎global.json

-6
This file was deleted.

Diff for: ‎serilog-sinks-trace.sln

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
77
EndProject
@@ -10,21 +10,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
1010
assets\Serilog.snk = assets\Serilog.snk
1111
EndProjectSection
1212
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Trace", "src\Serilog.Sinks.Trace\Serilog.Sinks.Trace.xproj", "{8849C92D-2120-4C82-8226-22DF40195237}"
14-
EndProject
1513
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5C546512-0A16-4730-BE35-88AD31D32AD7}"
1614
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Trace.Tests", "test\Serilog.Sinks.Trace.Tests\Serilog.Sinks.Trace.Tests.xproj", "{1D56534C-4009-42C2-A573-789CAE6B8AA9}"
18-
EndProject
1915
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{EF92FCAF-D99B-43B1-98AA-6ABE30E3AD7E}"
2016
ProjectSection(SolutionItems) = preProject
2117
appveyor.yml = appveyor.yml
2218
Build.ps1 = Build.ps1
23-
global.json = global.json
2419
NuGet.Config = NuGet.Config
2520
README.md = README.md
2621
EndProjectSection
2722
EndProject
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Trace", "src\Serilog.Sinks.Trace\Serilog.Sinks.Trace.csproj", "{8849C92D-2120-4C82-8226-22DF40195237}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Trace.Tests", "test\Serilog.Sinks.Trace.Tests\Serilog.Sinks.Trace.Tests.csproj", "{1D56534C-4009-42C2-A573-789CAE6B8AA9}"
26+
EndProject
2827
Global
2928
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3029
Debug|Any CPU = Debug|Any CPU

Diff for: ‎src/Serilog.Sinks.Trace/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
using System.Reflection;
33
using System.Runtime.CompilerServices;
44

5-
[assembly: AssemblyVersion("2.0.0.0")]
6-
75
[assembly: CLSCompliant(true)]
86

97
[assembly: InternalsVisibleTo("Serilog.Tests, PublicKey=" +

Diff for: ‎src/Serilog.Sinks.Trace/Serilog.Sinks.Trace.csproj

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>The diagnostic trace sink for Serilog.</Description>
5+
<VersionPrefix>3.0.0</VersionPrefix>
6+
<Authors>Serilog Contributors</Authors>
7+
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
11+
<SignAssembly>true</SignAssembly>
12+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
13+
<PackageTags>serilog;trace;diagnostic</PackageTags>
14+
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-trace</PackageProjectUrl>
15+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16+
<PackageIcon>serilog-sink-nuget.png</PackageIcon>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="Serilog" Version="2.10.0" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
24+
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<None Include="..\..\assets\serilog-sink-nuget.png">
29+
<Pack>True</Pack>
30+
<PackagePath></PackagePath>
31+
</None>
32+
</ItemGroup>
33+
34+
</Project>

Diff for: ‎src/Serilog.Sinks.Trace/Serilog.Sinks.Trace.xproj

-18
This file was deleted.

Diff for: ‎src/Serilog.Sinks.Trace/project.json

-33
This file was deleted.

Diff for: ‎test/Serilog.Sinks.Trace.Tests/Properties/AssemblyInfo.cs

-19
This file was deleted.

Diff for: ‎test/Serilog.Sinks.Trace.Tests/Serilog.Sinks.Trace.Tests.csproj

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net452;netcoreapp3.1;net50</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\Serilog.Sinks.Trace\Serilog.Sinks.Trace.csproj" />
9+
</ItemGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="xunit" Version="2.4.1" />
18+
</ItemGroup>
19+
20+
</Project>

Diff for: ‎test/Serilog.Sinks.Trace.Tests/Serilog.Sinks.Trace.Tests.xproj

-21
This file was deleted.

Diff for: ‎test/Serilog.Sinks.Trace.Tests/project.json

-26
This file was deleted.

0 commit comments

Comments
 (0)