Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a common.props for version number and nuget package info. #186

Merged
merged 5 commits into from
Apr 5, 2024
Merged

Create a common.props for version number and nuget package info. #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c32bcb9
Create a common.props for version number and nuget package info.
EEParker Apr 5, 2024
7adaca6
Add back missing prop
EEParker Apr 5, 2024
72b0996
Fix for readme file include in nupkg
EEParker Apr 5, 2024
3aa620b
Filter build script to directories only
EEParker Apr 5, 2024
84f7272
Enable all samples
EEParker Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Write-Output "build: Revision: $revision"
Write-Output "build: VersionPrefix: $prefix"
Write-Output "build: VersionSuffix: $suffix"

foreach ($src in Get-ChildItem src/*) {
foreach ($src in Get-ChildItem src/* -Directory) {
Push-Location $src

Write-Output "build: Packaging project in $src"
Expand Down
2 changes: 0 additions & 2 deletions sample/Sample/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ public static async Task Main(string[] args)
logger.Information("Creating logger {MethodName}.", nameof(ReproduceGitHubIssue183));
ReproduceGitHubIssue183();

return;

logger.Information("Creating logger {MethodName}.", nameof(OverridingSubsecondPrecisionMicroseconds));
OverridingSubsecondPrecisionMicroseconds(eventsToCreate);

Expand Down
3 changes: 2 additions & 1 deletion serilog-sinks-splunk.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{B9B133
.editorconfig = .editorconfig
Build.ps1 = Build.ps1
CHANGES.md = CHANGES.md
src\common.props = src\common.props
global.json = global.json
README.md = README.md
assets\Serilog.snk = assets\Serilog.snk
global.json = global.json
Setup.ps1 = Setup.ps1
EndProjectSection
EndProject
Expand Down
20 changes: 4 additions & 16 deletions src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../common.props"/>

<PropertyGroup>
<Description>The Splunk Sink for Serilog</Description>
<VersionPrefix>4.0.1</VersionPrefix>
<Authors>Matthew Erbs, Serilog Contributors</Authors>
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Serilog.Sinks.Splunk</AssemblyName>
<PackageId>Serilog.Sinks.Splunk</PackageId>
<PackageTags>serilog;splunk;logging;event;collector;hec</PackageTags>
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<SignAssembly>true</SignAssembly>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RootNamespace>Serilog</RootNamespace>
<LangVersion>latest</LangVersion>
<IsPackable>true</IsPackable>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<None Include="../../README.md" Pack="true" PackagePath="\"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="4.0.1" />
Expand Down
16 changes: 2 additions & 14 deletions src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../common.props"/>

<PropertyGroup>
<Description>The Splunk TCP Sink for Serilog</Description>
<VersionPrefix>4.0.1</VersionPrefix>
<Authors>Matthew Erbs, Serilog Contributors</Authors>
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Serilog.Sinks.Splunk.TCP</AssemblyName>
<PackageId>Serilog.Sinks.Splunk.TCP</PackageId>
<PackageTags>serilog;splunk;logging;tcp</PackageTags>
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<SignAssembly>true</SignAssembly>
<IsPackable>true</IsPackable>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<None Include="../../README.md" Pack="true" PackagePath="\"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog.Sinks.Splunk" Version="4.0.0" />
<PackageReference Include="Splunk.Logging.Common.Core" Version="1.0.0" />
Expand Down
17 changes: 3 additions & 14 deletions src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../common.props" />

<PropertyGroup>
<Description>The Splunk UDP Sink for Serilog</Description>
<VersionPrefix>4.0.1</VersionPrefix>
<Authors>Matthew Erbs, Serilog Contributors</Authors>
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Serilog.Sinks.Splunk.UDP</AssemblyName>
<PackageId>Serilog.Sinks.Splunk.UDP</PackageId>
<PackageTags>serilog;splunk;logging;udp</PackageTags>
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<IsPackable>true</IsPackable>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<None Include="../../README.md" Pack="true" PackagePath="\"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog.Sinks.Splunk" Version="4.0.0" />
</ItemGroup>
Expand Down
20 changes: 20 additions & 0 deletions src/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">4.0.2</VersionPrefix>
<VersionSuffix Condition="$(VersionSuffix) == '' and '$(Configuration)' == 'Debug' ">debug</VersionSuffix>
<Authors>Matthew Erbs, Serilog Contributors</Authors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<LangVersion>latest</LangVersion>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
<ItemGroup>
<None Include="../../README.md" Pack="true" PackagePath="\" />
</ItemGroup>
</Project>
Loading