Skip to content

Commit 0bc82f5

Browse files
merblamerbla
authored
Merge pull request #115 from serilog/dev
3.3 Release
2 parents fe81dd4 + 6d75f18 commit 0bc82f5

File tree

6 files changed

+36
-12
lines changed

6 files changed

+36
-12
lines changed

‎CHANGES.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 3.3.0
2+
- Correct issues relating to #76 and signing.
3+
- Bump version to 3.3 for core Sink.
4+
- Bump version to 1.2 for UDP Sink.
5+
- Bump version to 1.2 for TCP Sink.
6+
7+
## 3.2.0
8+
- Remove TravisCI for Linux builds
9+
- Add AppVeyor for Linux Builds
10+
- [#76](https://github.com/serilog/serilog-sinks-splunk/issues/76)
11+
12+
## 3.1.0
13+
- [#105](https://github.com/serilog/serilog-sinks-splunk/pull/105)
14+
115
## 3.0.0
216
- [#76](https://github.com/serilog/serilog-sinks-splunk/issues/76) Add strong naming/signing to `Serilog.Sinks.Splunk`.
317
- [#88](https://github.com/serilog/serilog-sinks-splunk/issues/88) Split Sinks into separate packages for maintainability.

‎src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>The Splunk Sink for Serilog</Description>
5-
<VersionPrefix>3.2.0</VersionPrefix>
5+
<VersionPrefix>3.3.0</VersionPrefix>
66
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>net45;netstandard1.1;netstandard2.0</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -15,7 +15,7 @@
1515
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
1616
<RepositoryType>git</RepositoryType>
1717
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
18-
<PublicSign>true</PublicSign>
18+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1919
<SignAssembly>true</SignAssembly>
2020
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2121
</PropertyGroup>

‎src/Serilog.Sinks.TCP/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

4-
[assembly: AssemblyVersion("2.0.0.0")]
5-
6-
[assembly: InternalsVisibleTo("Serilog.Sinks.Splunk.Tests")]
4+
[assembly: InternalsVisibleTo("Serilog.Sinks.Splunk.Tests, PublicKey=" +
5+
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
6+
"6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +
7+
"d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b818" +
8+
"94191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066" +
9+
"b19485ec")]

‎src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>The Splunk TCP Sink for Serilog</Description>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>1.2.0</VersionPrefix>
66
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>net45;</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -14,7 +14,9 @@
1414
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
1515
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
1616
<RepositoryType>git</RepositoryType>
17-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
17+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
18+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
19+
<SignAssembly>true</SignAssembly>
1820
</PropertyGroup>
1921

2022
<ItemGroup>

‎src/Serilog.Sinks.UDP/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

4-
[assembly: AssemblyVersion("2.0.0.0")]
5-
6-
[assembly: InternalsVisibleTo("Serilog.Sinks.Splunk.Tests")]
4+
[assembly: InternalsVisibleTo("Serilog.Sinks.Splunk.Tests, PublicKey=" +
5+
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
6+
"6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +
7+
"d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b818" +
8+
"94191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066" +
9+
"b19485ec")]

‎src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>The Splunk UDP Sink for Serilog</Description>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>1.2.0</VersionPrefix>
66
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>net45</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -14,7 +14,9 @@
1414
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
1515
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
1616
<RepositoryType>git</RepositoryType>
17-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
17+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
18+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
19+
<SignAssembly>true</SignAssembly>
1820
</PropertyGroup>
1921

2022
<ItemGroup>

0 commit comments

Comments
 (0)