Skip to content

Commit 0f1c86d

Browse files
merblamerbla
committed
Merge pull request #2 from merbla/master
Package changes to aid redirect issues
2 parents 6a7f02e + 6cfcbf6 commit 0f1c86d

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,21 @@
4040
<AssemblyOriginatorKeyFile>..\..\assets\Serilog.snk</AssemblyOriginatorKeyFile>
4141
</PropertyGroup>
4242
<ItemGroup>
43-
<Reference Include="Serilog, Version=1.4.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
43+
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\packages\Serilog.1.4.168\lib\net45\Serilog.dll</HintPath>
45+
<HintPath>..\..\packages\Serilog.1.5.1\lib\net45\Serilog.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Serilog.FullNetFx">
48-
<HintPath>..\..\packages\Serilog.1.4.168\lib\net45\Serilog.FullNetFx.dll</HintPath>
47+
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
48+
<SpecificVersion>False</SpecificVersion>
49+
<HintPath>..\..\packages\Serilog.1.5.1\lib\net45\Serilog.FullNetFx.dll</HintPath>
4950
</Reference>
50-
<Reference Include="Splunk.Client, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<Reference Include="Splunk.Client, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL">
5152
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\..\packages\Splunk.Client.2.0.0\lib\portable-net45+win+wpa81\Splunk.Client.dll</HintPath>
53+
<HintPath>..\..\packages\Splunk.Client.2.1.2\lib\portable-net45+win+wpa81\Splunk.Client.dll</HintPath>
5354
</Reference>
54-
<Reference Include="Splunk.Logging.Common">
55-
<HintPath>..\..\packages\Splunk.Logging.Common.1.0.0\lib\net45\Splunk.Logging.Common.dll</HintPath>
55+
<Reference Include="Splunk.Logging.Common, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>..\..\packages\Splunk.Logging.Common.1.1.0\lib\net45\Splunk.Logging.Common.dll</HintPath>
5658
</Reference>
5759
<Reference Include="System" />
5860
<Reference Include="System.Core" />

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

Lines changed: 3 additions & 3 deletions
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.4.168" targetFramework="net45" />
4-
<package id="Splunk.Client" version="2.0.0" targetFramework="net45" />
5-
<package id="Splunk.Logging.Common" version="1.0.0" targetFramework="net45" />
3+
<package id="Serilog" version="1.5.1" targetFramework="net45" />
4+
<package id="Splunk.Client" version="2.1.2" targetFramework="net45" />
5+
<package id="Splunk.Logging.Common" version="1.1.0" targetFramework="net45" />
66
</packages>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<Reference Include="Serilog">
62-
<HintPath>..\..\packages\Serilog.1.4.168\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
62+
<HintPath>..\..\packages\Serilog.1.5.1\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Splunk.Client">
65-
<HintPath>..\..\packages\Splunk.Client.2.0.0\lib\portable-net45+win8+monotouch+monoandroid\Splunk.Client.dll</HintPath>
65+
<HintPath>..\..\packages\Splunk.Client.2.1.2\lib\portable-net45+win+wpa81\Splunk.Client.dll</HintPath>
66+
<Private>True</Private>
6667
</Reference>
6768
</ItemGroup>
6869
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

‎src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>Serilog.Sinks.Splunk</id>
55
<version>$version$</version>
6-
<authors>Serilog Contributors</authors>
6+
<authors>Matthew Erbs, Serilog Contributors</authors>
77
<description>Serilog event sink that writes to Splunk.</description>
88
<language>en-US</language>
99
<projectUrl>http://serilog.net</projectUrl>
@@ -12,11 +12,11 @@
1212
<tags>serilog logging splunk</tags>
1313
<dependencies>
1414
<group>
15-
<dependency id="Serilog" version="[1.4.204,2)" />
16-
<dependency id="Splunk.Client" version="2.0.0" />
15+
<dependency id="Serilog" version="[1.5,2)" />
16+
<dependency id="Splunk.Client" version="[2.1,3]" />
1717
</group>
1818
<group targetFramework="net45">
19-
<dependency id="Splunk.Logging.Common" version="1.0.0" />
19+
<dependency id="Splunk.Logging.Common" version="[1.1,2]" />
2020
</group>
2121
</dependencies>
2222
</metadata>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Serilog" version="1.4.168" targetFramework="portable-net45+win" />
4-
<package id="Splunk.Client" version="2.0.0" targetFramework="portable-net45+win+MonoAndroid10+MonoTouch10" />
3+
<package id="Serilog" version="1.5.1" targetFramework="portable-net45+win" />
4+
<package id="Splunk.Client" version="2.1.2" targetFramework="portable-net45+win" />
55
</packages>

0 commit comments

Comments
 (0)