Skip to content

Commit 3734cc6

Browse files
committed
Change Elasticsearch.Net.JsonNET target framework to 4.0
Closes #1053
1 parent a4f5023 commit 3734cc6

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

build/Elasticsearch.Net.JsonNET.nuspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<description>This package is only useful if you use the low level client ONLY and do not use NEST but would like to use JSON.NET as your serializer</description>
1515
<dependencies>
1616
<dependency id="Elasticsearch.Net" version="1.2.1"/>
17+
<dependency id="Newtonsoft.Json" version="6.0.1"/>
1718
</dependencies>
1819
<tags>elasticsearch elastic search lucene thrift nest</tags>
1920
</metadata>

dep/repositories.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<repository path="../src/Nest/packages.config" />
88
<repository path="../src/Profiling/Profiling.Indexing/packages.config" />
99
<repository path="../src/Profiling/Profiling.InMemoryConnection/packages.config" />
10-
<repository path="../src/Serialization/Elasticsearch.Net.JsonNET/packages.config" />
1110
<repository path="../src/Tests/Elasticsearch.Net.Integration.Yaml/packages.config" />
1211
<repository path="../src/Tests/Elasticsearch.Net.Tests.Unit/packages.config" />
1312
<repository path="../src/Tests/Nest.Tests.Integration/packages.config" />

src/Serialization/Elasticsearch.Net.JsonNET/Elasticsearch.Net.JsonNet.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Elasticsearch.Net.JsonNet</RootNamespace>
1111
<AssemblyName>Elasticsearch.Net.JsonNet</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -41,7 +42,7 @@
4142
<ItemGroup>
4243
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4344
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
45+
<HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
4546
</Reference>
4647
<Reference Include="System" />
4748
<Reference Include="System.Core" />
@@ -62,11 +63,12 @@
6263
</ProjectReference>
6364
</ItemGroup>
6465
<ItemGroup>
65-
<None Include="keypair.snk" />
66-
<None Include="packages.config" />
66+
<None Include="packages.config">
67+
<SubType>Designer</SubType>
68+
</None>
6769
</ItemGroup>
6870
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
69-
<PropertyGroup>
71+
<PropertyGroup>
7072
<PreBuildEvent Condition=" '$(OS)' != 'Unix' ">IF NOT EXIST "$(SolutionDir)..\build\keys\keypair.snk" (CD "$(SolutionDir).." &amp;&amp; "build.bat" CreateKeysIfAbsent &amp;&amp; CD %25~dp0)
7173
</PreBuildEvent>
7274
</PropertyGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net40" />
44
</packages>

0 commit comments

Comments
 (0)