Skip to content
This repository was archived by the owner on Jun 1, 2024. It is now read-only.

Rebuild Serilog.Sinks.Elasticsearch with the latest version of depend… #20

Merged
merged 5 commits into from
Jan 4, 2016
Merged

Rebuild Serilog.Sinks.Elasticsearch with the latest version of depend… #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec6b557
Rebuild Serilog.Sinks.Elasticsearch with the latest version of depend…
konste Dec 27, 2015
321b689
Reverted the change to .nuspec file which inadvertently broke net40 s…
konste Dec 28, 2015
721f46b
Fixed package reference in the test project.
konste Jan 4, 2016
b4248b2
Fixed package references for Serilog.Sinks.Elasticsearch-net40.csproj.
konste Jan 4, 2016
73d72e2
Fixed 40 project to reference 40 version of dependencies.
konste Jan 4, 2016
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
8 changes: 4 additions & 4 deletions src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.ElasticSearch.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<iconUrl>http://serilog.net/images/serilog-sink-nuget.png</iconUrl>
<tags>serilog logging elasticsearch</tags>
<dependencies>
<dependency id="Serilog" version="[1.4.204,2)" />
<dependency id="Elasticsearch.Net" version="1.1.2" />
<dependency id="Serilog" version="[1.5.14,2)" />
<dependency id="Elasticsearch.Net" version="1.7.1" />
</dependencies>
</metadata>
<files>
<file src="bin40\Release\Serilog.Sinks.Elasticsearch.dll" target="lib\net40" />
<file src="bin40\Release\Serilog.Sinks.Elasticsearch.xml" target="lib\net40" />
<file src="bin\Release\Serilog.Sinks.Elasticsearch.dll" target="lib\net45" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropping support for .NET 4? (The 4.5 binaries are included in the package by default.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was not sure how exactly support for net40 is done. Are you saying those two lines should stay as they were? My concern is that the sink's own packages.config (there is only one) always refers to net45 version of Serilog and SerilogFullNetFx, so it seems like what this sink builds as net40 still requires 4.5!

In short - it seems to me that Serilog.Sinks.Elasticsearch already dropped net40 silently. I may be wrong though.

Do you know what specific nuget command is used to build the package with both binaries? I don't see it among the sources.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just discovered Build.ps1. Taking another look.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, those two lines are reverted. Thanks for catching that quickly!

<file src="bin\Release\Serilog.Sinks.Elasticsearch.xml" target="lib\net45" />
</files>
</package>
13 changes: 7 additions & 6 deletions src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,14 @@
<AssemblyOriginatorKeyFile>..\..\assets\Serilog.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Elasticsearch.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Elasticsearch.Net.1.1.2\lib\Elasticsearch.Net.dll</HintPath>
<Reference Include="Elasticsearch.Net">
<HintPath>..\..\packages\Elasticsearch.Net.1.7.1\lib\net45\Elasticsearch.Net.dll</HintPath>
</Reference>
<Reference Include="Serilog">
<HintPath>..\..\packages\Serilog.1.4.196\lib\net45\Serilog.dll</HintPath>
<HintPath>..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.FullNetFx">
<HintPath>..\..\packages\Serilog.1.4.196\lib\net45\Serilog.FullNetFx.dll</HintPath>
<HintPath>..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand All @@ -79,7 +78,9 @@
<Link>Serilog.snk</Link>
</None>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Serilog.Sinks.Elasticsearch.nuspec" />
<None Include="Serilog.Sinks.ElasticSearch.Symbols.nuspec" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Sinks.Elasticsearch/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Elasticsearch.Net" version="1.1.2" targetFramework="net45" />
<package id="Serilog" version="1.4.196" targetFramework="net45" />
<package id="Elasticsearch.Net" version="1.7.1" targetFramework="net45" />
<package id="Serilog" version="1.5.14" targetFramework="net45" />
</packages>
31 changes: 15 additions & 16 deletions test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,32 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Elasticsearch.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Elasticsearch.Net.1.2.3\lib\Elasticsearch.Net.dll</HintPath>
<Reference Include="Elasticsearch.Net">
<HintPath>..\..\src\Serilog.Sinks.Elasticsearch\packages\Elasticsearch.Net.1.7.1\lib\net45\Elasticsearch.Net.dll</HintPath>
</Reference>
<Reference Include="Elasticsearch.Net.JsonNet">
<HintPath>..\..\packages\Elasticsearch.Net.JsonNET.1.2.3\lib\Elasticsearch.Net.JsonNet.dll</HintPath>
<HintPath>..\..\packages\Elasticsearch.Net.JsonNET.1.7.1\lib\net45\Elasticsearch.Net.JsonNet.dll</HintPath>
</Reference>
<Reference Include="FakeItEasy">
<HintPath>..\..\packages\FakeItEasy.1.25.0\lib\net40\FakeItEasy.dll</HintPath>
<HintPath>..\..\packages\FakeItEasy.1.25.3\lib\net40\FakeItEasy.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions">
<HintPath>..\..\packages\FluentAssertions.3.2.1\lib\net45\FluentAssertions.dll</HintPath>
<HintPath>..\..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions.Core">
<HintPath>..\..\packages\FluentAssertions.3.2.1\lib\net45\FluentAssertions.Core.dll</HintPath>
<HintPath>..\..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.Core.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Serilog, Version=1.4.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Serilog.1.4.196\lib\net45\Serilog.dll</HintPath>
<Reference Include="Serilog">
<HintPath>..\..\src\Serilog.Sinks.Elasticsearch\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.FullNetFx, Version=1.4.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Serilog.1.4.196\lib\net45\Serilog.FullNetFx.dll</HintPath>
<Reference Include="Serilog.FullNetFx">
<HintPath>..\..\src\Serilog.Sinks.Elasticsearch\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -89,7 +86,9 @@
<Compile Include="Templating\SendsTemplateTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Templating\template.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
14 changes: 7 additions & 7 deletions test/Serilog.Sinks.Elasticsearch.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Elasticsearch.Net" version="1.2.3" targetFramework="net45" />
<package id="Elasticsearch.Net.JsonNET" version="1.2.3" targetFramework="net45" />
<package id="FakeItEasy" version="1.25.0" targetFramework="net45" />
<package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
<package id="Serilog" version="1.4.196" targetFramework="net45" />
<package id="Elasticsearch.Net" version="1.7.1" targetFramework="net45" />
<package id="Elasticsearch.Net.JsonNET" version="1.7.1" targetFramework="net45" />
<package id="FakeItEasy" version="1.25.3" targetFramework="net45" />
<package id="FluentAssertions" version="4.1.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
<package id="NUnit" version="3.0.1" targetFramework="net45" />
<package id="Serilog" version="1.5.14" targetFramework="net45" />
</packages>