Skip to content

Commit 6d40a30

Browse files
merblamerbla
committed
Merge pull request #4 from merbla/master
Setup of sample project ready for template change #424
2 parents 1744de7 + 8dcaed8 commit 6d40a30

File tree

11 files changed

+168
-10
lines changed

11 files changed

+168
-10
lines changed

‎Build.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ function Invoke-NuGetPackSpec($nuspec, $version)
4242
}
4343

4444
function Invoke-NuGetPack($version)
45-
{
46-
# ls src/**/*.csproj |
47-
# Where-Object { -not ($_.Name -like "*net40*") } |
48-
# ForEach-Object { Invoke-NuGetPackProj $_ }
49-
45+
{
5046
pushd .\src\Serilog.Sinks.Splunk
5147
Invoke-NuGetPackSpec "Serilog.Sinks.Splunk.nuspec" $version
5248
popd

‎sample/Serilog.Sinks.Splunk.Sample/App.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
5+
</startup>
6+
</configuration>

‎sample/Serilog.Sinks.Splunk.Sample/Program.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Concurrent;
3+
using System.Linq;
4+
5+
namespace Serilog.Sinks.Splunk.Sample
6+
{
7+
class Program
8+
{
9+
static void Main(string[] args)
10+
{
11+
Log.Logger = new LoggerConfiguration()
12+
.WriteTo.LiterateConsole()
13+
.WriteTo.SplunkViaTcp("127.0.0.1", 10001)
14+
.CreateLogger();
15+
16+
Log.Information("Just another test");
17+
18+
Console.ReadLine();
19+
}
20+
}
21+
}

‎sample/Serilog.Sinks.Splunk.Sample/Properties/AssemblyInfo.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("Serilog.Sinks.Splunk.Sample")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("Serilog.Sinks.Splunk.Sample")]
13+
[assembly: AssemblyCopyright("Copyright © 2015")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("eeec2567-cd87-4b00-8749-50b1dd22c975")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎sample/Serilog.Sinks.Splunk.Sample/Serilog.Sinks.Splunk.Sample.csproj

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
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')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}</ProjectGuid>
8+
<OutputType>Exe</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Serilog.Sinks.Splunk.Sample</RootNamespace>
11+
<AssemblyName>Serilog.Sinks.Splunk.Sample</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<PlatformTarget>AnyCPU</PlatformTarget>
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<PlatformTarget>AnyCPU</PlatformTarget>
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
</PropertyGroup>
35+
<ItemGroup>
36+
<Reference Include="Serilog">
37+
<HintPath>..\..\packages\Serilog.1.5.5\lib\net45\Serilog.dll</HintPath>
38+
</Reference>
39+
<Reference Include="Serilog.FullNetFx">
40+
<HintPath>..\..\packages\Serilog.1.5.5\lib\net45\Serilog.FullNetFx.dll</HintPath>
41+
</Reference>
42+
<Reference Include="Serilog.Sinks.Literate">
43+
<HintPath>..\..\packages\Serilog.Sinks.Literate.1.0.6\lib\net45\Serilog.Sinks.Literate.dll</HintPath>
44+
</Reference>
45+
<Reference Include="Splunk.Client">
46+
<HintPath>..\..\packages\Splunk.Client.2.1.2\lib\portable-net45+win+wpa81\Splunk.Client.dll</HintPath>
47+
</Reference>
48+
<Reference Include="Splunk.Logging.Common">
49+
<HintPath>..\..\packages\Splunk.Logging.Common.1.1.0\lib\net45\Splunk.Logging.Common.dll</HintPath>
50+
<Private>True</Private>
51+
</Reference>
52+
<Reference Include="System" />
53+
<Reference Include="System.Core" />
54+
<Reference Include="Microsoft.CSharp" />
55+
</ItemGroup>
56+
<ItemGroup>
57+
<Compile Include="Program.cs" />
58+
<Compile Include="Properties\AssemblyInfo.cs" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<None Include="App.config" />
62+
<None Include="packages.config" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<ProjectReference Include="..\..\src\Serilog.Sinks.Splunk.FullNetFx\Serilog.Sinks.Splunk.FullNetFx.csproj">
66+
<Project>{17deed0f-f9cb-48fb-b4dc-53fb6aee64d7}</Project>
67+
<Name>Serilog.Sinks.Splunk.FullNetFx</Name>
68+
</ProjectReference>
69+
<ProjectReference Include="..\..\src\Serilog.Sinks.Splunk\Serilog.Sinks.Splunk.csproj">
70+
<Project>{1493abc3-811c-46c7-92ed-ceb7567fb588}</Project>
71+
<Name>Serilog.Sinks.Splunk</Name>
72+
</ProjectReference>
73+
</ItemGroup>
74+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
75+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
76+
Other similar extension points exist, see Microsoft.Common.targets.
77+
<Target Name="BeforeBuild">
78+
</Target>
79+
<Target Name="AfterBuild">
80+
</Target>
81+
-->
82+
</Project>

‎sample/Serilog.Sinks.Splunk.Sample/packages.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Serilog" version="1.5.5" targetFramework="net451" />
4+
<package id="Serilog.Sinks.Literate" version="1.0.6" targetFramework="net451" />
5+
<package id="Splunk.Client" version="2.1.2" targetFramework="net451" />
6+
<package id="Splunk.Logging.Common" version="1.1.0" targetFramework="net451" />
7+
8+
</packages>

‎serilog-sinks-splunk.sln

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{B9B133
1717
assets\Serilog.snk = assets\Serilog.snk
1818
EndProjectSection
1919
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{EBB6CE48-09B0-4789-9627-45A1D4D377F7}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Splunk.Sample", "sample\Serilog.Sinks.Splunk.Sample\Serilog.Sinks.Splunk.Sample.csproj", "{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}"
23+
EndProject
2024
Global
2125
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2226
Debug|Any CPU = Debug|Any CPU
@@ -31,12 +35,17 @@ Global
3135
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
3236
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
3337
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Release|Any CPU.Build.0 = Release|Any CPU
3442
EndGlobalSection
3543
GlobalSection(SolutionProperties) = preSolution
3644
HideSolutionNode = FALSE
3745
EndGlobalSection
3846
GlobalSection(NestedProjects) = preSolution
3947
{1493ABC3-811C-46C7-92ED-CEB7567FB588} = {7A774CBB-A6E9-4854-B4DB-4CF860B0C1C5}
4048
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7} = {7A774CBB-A6E9-4854-B4DB-4CF860B0C1C5}
49+
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238} = {EBB6CE48-09B0-4789-9627-45A1D4D377F7}
4150
EndGlobalSection
4251
EndGlobal

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
<ItemGroup>
4343
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\packages\Serilog.1.5.1\lib\net45\Serilog.dll</HintPath>
45+
<HintPath>..\..\packages\Serilog.1.5.5\lib\net45\Serilog.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\packages\Serilog.1.5.1\lib\net45\Serilog.FullNetFx.dll</HintPath>
49+
<HintPath>..\..\packages\Serilog.1.5.5\lib\net45\Serilog.FullNetFx.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Splunk.Client, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>

‎src/Serilog.Sinks.Splunk.FullNetFx/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Serilog" version="1.5.1" targetFramework="net45" />
3+
<package id="Serilog" version="1.5.5" targetFramework="net45" />
44
<package id="Splunk.Client" version="2.1.2" targetFramework="net45" />
55
<package id="Splunk.Logging.Common" version="1.1.0" targetFramework="net45" />
66
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<Reference Include="Serilog">
62-
<HintPath>..\..\packages\Serilog.1.5.1\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
62+
<HintPath>..\..\packages\Serilog.1.5.5\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Splunk.Client">
6565
<HintPath>..\..\packages\Splunk.Client.2.1.2\lib\portable-net45+win+wpa81\Splunk.Client.dll</HintPath>

0 commit comments

Comments
 (0)