Skip to content

Commit 0b27d6d

Browse files
author
Paul Marvin
committed
SF-6793: Serilog.Sinks.Stackify nuget package
* add .vs/ to .gitignore * Update readme to remove old build server * Replace old xproj with new csproj with same targets (netstandard1.3;net45) * Move nuget metadata to new csproj, enable package on build, remove old nuspec
1 parent c062748 commit 0b27d6d

16 files changed

+96
-240
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,5 @@ $RECYCLE.BIN/
230230
# Windows shortcuts
231231
*.lnk
232232
Example/AppSettings.config
233-
/.vs/restore.dg
234233
/Serilog.Sinks.Stackify/project.lock.json
234+
.vs/

‎Example/App.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5-
</startup>
6-
<appSettings file="AppSettings.config">
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5+
</startup>
6+
<appSettings>
77
<add key="Stackify.AppName" value="" />
88
<add key="Stackify.Environment" value="" />
99
<add key="Stackify.ApiKey" value="" />

‎Example/Example.csproj

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<AssemblyName>Example</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,17 +33,18 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
36+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
38+
<Private>True</Private>
39+
</Reference>
3540
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\packages\Serilog.1.5.7\lib\net45\Serilog.dll</HintPath>
41+
<HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
3842
</Reference>
3943
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\packages\Serilog.1.5.7\lib\net45\Serilog.FullNetFx.dll</HintPath>
44+
<HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
4245
</Reference>
43-
<Reference Include="StackifyLib, Version=1.12.5589.24146, Culture=neutral, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\packages\StackifyLib.1.12.0.0\lib\StackifyLib.dll</HintPath>
46+
<Reference Include="StackifyLib, Version=1.25.4.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\StackifyLib.1.25.4\lib\net45\StackifyLib.dll</HintPath>
4648
</Reference>
4749
<Reference Include="System" />
4850
<Reference Include="System.Core" />
@@ -60,7 +62,15 @@
6062
<None Include="App.config">
6163
<SubType>Designer</SubType>
6264
</None>
63-
<None Include="packages.config" />
65+
<None Include="packages.config">
66+
<SubType>Designer</SubType>
67+
</None>
68+
</ItemGroup>
69+
<ItemGroup>
70+
<ProjectReference Include="..\Serilog.Sinks.Stackify\Serilog.Sinks.Stackify.csproj">
71+
<Project>{e44ec161-7aef-40f1-9ffc-c98a3f105f23}</Project>
72+
<Name>Serilog.Sinks.Stackify</Name>
73+
</ProjectReference>
6474
</ItemGroup>
6575
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6676
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎Example/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ static void Main(string[] args)
3636
static void ConfigureLogging()
3737
{
3838
Log.Logger = new LoggerConfiguration()
39-
.WriteTo.Stackify()
39+
.WriteTo
40+
.Stackify()
4041
.CreateLogger();
4142
}
4243
}

‎Example/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Serilog" version="1.5.7" targetFramework="net45" />
4-
<package id="StackifyLib" version="1.12.0.0" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
4+
<package id="Serilog" version="1.5.14" targetFramework="net45" />
5+
<package id="StackifyLib" version="1.25.4" targetFramework="net45" />
56
</packages>

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Serilog.Sinks.Stackify
22

3-
[![Build status](https://ci.appveyor.com/api/projects/status/k1p4fbf5wt9m7yr8?svg=true)](https://ci.appveyor.com/project/jpknoll/serilog-sinks-stackify)
4-
53
A Serilog sink that writes events to stackify. [Stackify](http://www.stackify.com) is a cloud hosted solution to capture log messages. Register for an account at their website and use the provided GUID in the configuration for Serilog.
64

75
**Package** - [Serilog.Sinks.Stackify](http://nuget.org/packages/serilog.sinks.Stackify)

‎Serilog.Sinks.Stackify.sln

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,41 @@
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.26621.2
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example", "Example\Example.csproj", "{50C48CCC-8551-459A-A306-95D84DC3A422}"
77
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Stackify", "Serilog.Sinks.Stackify\Serilog.Sinks.Stackify.xproj", "{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Stackify", "Serilog.Sinks.Stackify\Serilog.Sinks.Stackify.csproj", "{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13+
Debug|x86 = Debug|x86
1314
Release|Any CPU = Release|Any CPU
15+
Release|x86 = Release|x86
1416
EndGlobalSection
1517
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1618
{50C48CCC-8551-459A-A306-95D84DC3A422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1719
{50C48CCC-8551-459A-A306-95D84DC3A422}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{50C48CCC-8551-459A-A306-95D84DC3A422}.Debug|x86.ActiveCfg = Debug|Any CPU
21+
{50C48CCC-8551-459A-A306-95D84DC3A422}.Debug|x86.Build.0 = Debug|Any CPU
1822
{50C48CCC-8551-459A-A306-95D84DC3A422}.Release|Any CPU.ActiveCfg = Release|Any CPU
1923
{50C48CCC-8551-459A-A306-95D84DC3A422}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{50C48CCC-8551-459A-A306-95D84DC3A422}.Release|x86.ActiveCfg = Release|Any CPU
25+
{50C48CCC-8551-459A-A306-95D84DC3A422}.Release|x86.Build.0 = Release|Any CPU
26+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Debug|x86.ActiveCfg = Debug|Any CPU
29+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Debug|x86.Build.0 = Debug|Any CPU
30+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Release|x86.ActiveCfg = Release|Any CPU
33+
{E44EC161-7AEF-40F1-9FFC-C98A3F105F23}.Release|x86.Build.0 = Release|Any CPU
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE
2737
EndGlobalSection
38+
GlobalSection(ExtensibilityGlobals) = postSolution
39+
SolutionGuid = {06EA1300-6B02-49E9-8A31-2549C9525B89}
40+
EndGlobalSection
2841
EndGlobal

‎Serilog.Sinks.Stackify/JsonDataFormatter.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using Serilog.Events;
5-
using Serilog.Formatting.Json;
6-
7-
// Copyright 2015 John Knoll <[email protected]>
8-
//
1+
// Copyright 2015 John Knoll <[email protected]>
2+
//
93
// Licensed under the Apache License, Version 2.0 (the "License");
104
// you may not use this file except in compliance with the License.
115
// You may obtain a copy of the License at
12-
//
6+
//
137
// http://www.apache.org/licenses/LICENSE-2.0
14-
//
8+
//
159
// Unless required by applicable law or agreed to in writing, software
1610
// distributed under the License is distributed on an "AS IS" BASIS,
1711
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1812
// See the License for the specific language governing permissions and
1913
// limitations under the License.
2014

15+
using System;
16+
using System.Collections.Generic;
17+
using System.IO;
18+
using Serilog.Events;
19+
using Serilog.Formatting.Json;
20+
2121
namespace Serilog
2222
{
2323
public class JsonDataFormatter : JsonFormatter

‎Serilog.Sinks.Stackify/LoggerConfigurationStackifyExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright 2015 John Knoll <[email protected]>
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ namespace Serilog
2525
public static class LoggerConfigurationStackifyExtensions
2626
{
2727
/// <summary>
28-
/// Adds a sink that writes log events to the elmah.io webservice.
28+
/// Adds a sink that writes log events to the elmah.io webservice.
2929
/// </summary>
3030
/// <param name="loggerConfiguration">The logger configuration.</param>
3131
/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>

‎Serilog.Sinks.Stackify/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎Serilog.Sinks.Stackify/Serilog.Sinks.Stackify.csproj

Lines changed: 29 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{B1EB8AE7-CC8D-4E0C-958E-C0A77DBE002B}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Serilog</RootNamespace>
4+
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
5+
<PackageId>Serilog.Sinks.Stackify</PackageId>
6+
<Version>1.25.5</Version>
7+
<Authors>stackify_matt;,taylorstackify</Authors>
8+
<Company>Stackify, LLC</Company>
9+
<Product>Serilog Stackify Sink</Product>
10+
<Description>Serilog sink to send errors and logs to Stackify and Prefix</Description>
11+
<Copyright>Stackify, LLC 2017</Copyright>
12+
<PackageTags>stackify errors logs serilog</PackageTags>
13+
<PackageIconUrl>http://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
14+
<PackageProjectUrl>https://stackify.com/</PackageProjectUrl>
15+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
16+
<RepositoryUrl>https://github.com/stackify/Serilog.Sinks.Stackify</RepositoryUrl>
17+
<RepositoryType>git</RepositoryType>
18+
<NeutralLanguage>en-US</NeutralLanguage>
1119
<AssemblyName>Serilog.Sinks.Stackify</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
20+
<RootNamespace>Serilog.Sinks.Stackify</RootNamespace>
21+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1422
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
34-
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\packages\Serilog.1.5.7\lib\net45\Serilog.dll</HintPath>
36-
</Reference>
37-
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\Serilog.1.5.7\lib\net45\Serilog.FullNetFx.dll</HintPath>
40-
</Reference>
41-
<Reference Include="StackifyLib, Version=1.12.5589.24146, Culture=neutral, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\StackifyLib.1.12.0.0\lib\StackifyLib.dll</HintPath>
44-
</Reference>
45-
<Reference Include="System" />
46-
<Reference Include="System.Core" />
47-
<Reference Include="System.Xml.Linq" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.Data" />
51-
<Reference Include="System.Xml" />
52-
</ItemGroup>
53-
<ItemGroup>
54-
<Compile Include="JsonDataFormatter.cs" />
55-
<Compile Include="LoggerConfigurationStackifyExtensions.cs" />
56-
<Compile Include="Properties\AssemblyInfo.cs" />
57-
<Compile Include="Sinks\Stackify\StackifySink.cs" />
23+
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
25+
<PackageReference Include="Serilog" Version="2.0.0" />
26+
<PackageReference Include="StackifyLib" Version="1.25.4" />
5827
</ItemGroup>
59-
<ItemGroup>
60-
<None Include="app.config" />
61-
<None Include="packages.config" />
28+
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
30+
<PackageReference Include="Serilog" Version="1.5.14" />
31+
<PackageReference Include="StackifyLib" Version="1.25.4" />
6232
</ItemGroup>
63-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
64-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
65-
Other similar extension points exist, see Microsoft.Common.targets.
66-
<Target Name="BeforeBuild">
67-
</Target>
68-
<Target Name="AfterBuild">
69-
</Target>
70-
-->
71-
</Project>
33+
34+
</Project>

‎Serilog.Sinks.Stackify/Serilog.Sinks.Stackify.nuspec

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Serilog.Sinks.Stackify/Serilog.Sinks.Stackify.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)