Skip to content

Commit e859a15

Browse files
MpdreamzMpdreamz
committed
further cleanup
1 parent a5559ce commit e859a15

File tree

10 files changed

+5
-39
lines changed

10 files changed

+5
-39
lines changed

‎build/Elasticsearch.Net.nuspec

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<copyright>2014-$year$ Elasticsearch BV</copyright>
1717
<tags>elasticsearch,elastic,search,lucene,nest</tags>
1818
<dependencies>
19-
<group targetFramework=".NETFramework4.5" />
20-
<group targetFramework=".NETFramework4.6" />
2119
<group targetFramework=".NETStandard1.3">
2220
<dependency id="NETStandard.Library" version="[1.6.0, )" />
2321
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
@@ -30,12 +28,6 @@
3028
</dependencies>
3129
</metadata>
3230
<files>
33-
<file src="output\Elasticsearch.Net\net45\Elasticsearch.Net.dll" target="lib\net45"/>
34-
<file src="output\Elasticsearch.Net\net45\Elasticsearch.Net.XML" target="lib\net45"/>
35-
36-
<file src="output\Elasticsearch.Net\net46\Elasticsearch.Net.dll" target="lib\net46"/>
37-
<file src="output\Elasticsearch.Net\net46\Elasticsearch.Net.XML" target="lib\net46"/>
38-
3931
<file src="output\Elasticsearch.Net\netstandard1.3\Elasticsearch.Net.dll" target="lib\netstandard1.3"/>
4032
<file src="output\Elasticsearch.Net\netstandard1.3\Elasticsearch.Net.xml" target="lib\netstandard1.3"/>
4133
</files>

‎build/NEST.JsonNetSerializer.nuspec

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616
<copyright>2017-$year$ Elasticsearch BV</copyright>
1717
<tags>elasticsearch,elastic,search,lucene,nest,serializer,json</tags>
1818
<dependencies>
19-
<group targetFramework=".NETFramework4.5">
20-
<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
21-
<dependency id="Newtonsoft.Json" version="[$jsonDotNetCurrentVersion$, $jsonDotNetNextVersion$)" />
22-
</group>
23-
<group targetFramework=".NETFramework4.6">
24-
<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
25-
<dependency id="Newtonsoft.Json" version="[$jsonDotNetCurrentVersion$, $jsonDotNetNextVersion$)" />
26-
</group>
2719
<group targetFramework=".NETStandard1.3">
2820
<dependency id="NETStandard.Library" version="[1.6.0, )" />
2921
<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
@@ -32,12 +24,6 @@
3224
</dependencies>
3325
</metadata>
3426
<files>
35-
<file src="output\Nest.JsonNetSerializer\net45\Nest.JsonNetSerializer.dll" target="lib\net45"/>
36-
<file src="output\Nest.JsonNetSerializer\net45\Nest.JsonNetSerializer.XML" target="lib\net45"/>
37-
38-
<file src="output\Nest.JsonNetSerializer\net46\Nest.JsonNetSerializer.dll" target="lib\net46"/>
39-
<file src="output\Nest.JsonNetSerializer\net46\Nest.JsonNetSerializer.XML" target="lib\net46"/>
40-
4127
<file src="output\Nest.JsonNetSerializer\netstandard1.3\Nest.JsonNetSerializer.dll" target="lib\netstandard1.3"/>
4228
<file src="output\Nest.JsonNetSerializer\netstandard1.3\Nest.JsonNetSerializer.xml" target="lib\netstandard1.3"/>
4329
</files>

‎build/NEST.nuspec

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
<copyright>2014-$year$ Elasticsearch BV</copyright>
1717
<tags>elasticsearch,elastic,search,lucene,nest</tags>
1818
<dependencies>
19-
<group targetFramework=".NETFramework4.5">
20-
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
21-
</group>
22-
<group targetFramework=".NETFramework4.6">
23-
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
24-
</group>
2519
<group targetFramework=".NETStandard1.3">
2620
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
2721
<dependency id="NETStandard.Library" version="[1.6.0, )" />
@@ -38,12 +32,6 @@
3832
</dependencies>
3933
</metadata>
4034
<files>
41-
<file src="output\Nest\net45\Nest.dll" target="lib\net45"/>
42-
<file src="output\Nest\net45\Nest.XML" target="lib\net45"/>
43-
44-
<file src="output\Nest\net46\Nest.dll" target="lib\net46"/>
45-
<file src="output\Nest\net46\Nest.XML" target="lib\net46"/>
46-
4735
<file src="output\Nest\netstandard1.3\Nest.dll" target="lib\netstandard1.3"/>
4836
<file src="output\Nest\netstandard1.3\Nest.xml" target="lib\netstandard1.3"/>
4937
</files>

‎build/scripts/Testing.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module Tests =
4343
let p = ["xunit"; "-parallel"; "all"; "-xml"; "../.." @@ Paths.Output("TestResults-Desktop-Clr.xml")]
4444
match (target, buildingOnTravis) with
4545
| (_, true)
46-
| (Commandline.MultiTarget.One, _) -> ["-framework"; "netcoreapp1.1"] |> List.append p
46+
| (Commandline.MultiTarget.One, _) -> ["-framework"; "netcoreapp2.0"] |> List.append p
4747
| _ -> p
4848

4949
let dotnet = Tooling.BuildTooling("dotnet")

‎src/Connections/Elasticsearch.Net.Connections.WebRequestConnection/Elasticsearch.Net.Connections.WebRequestConnection.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup>
55
<TargetFrameworks>net46</TargetFrameworks>
66
<!--<CopyLocalLockFileAssemblies Condition="'$(TargetFramework)'=='netstandard1.3'">true</CopyLocalLockFileAssemblies>-->
7-
<OldToolsVersion>2.0</OldToolsVersion>
87
</PropertyGroup>
98
<ItemGroup>
109
<ProjectReference Include="..\..\Elasticsearch.Net\Elasticsearch.Net.csproj" />

‎src/Connections/Elasticsearch.Net.Connections.WebRequestConnection/WebRequestConnection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Linq;
66
using System.Net;
77
using System.Net.Security;
8+
using System.Security.Cryptography.X509Certificates;
89
using System.Text;
910
using System.Threading;
1011
using System.Threading.Tasks;

‎src/Elasticsearch.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
2222
..\paket.bat = ..\paket.bat
2323
..\paket.dependencies = ..\paket.dependencies
2424
..\readme.md = ..\readme.md
25+
outputpath.props = outputpath.props
2526
EndProjectSection
2627
EndProject
2728
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeGeneration", "CodeGeneration", "{93331BEE-0AA0-47B7-B1D2-BD5BD31634D1}"

‎src/Nest/Nest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\Clients.Common.targets" />
44
<PropertyGroup>
55
<TargetFrameworks>netstandard1.3</TargetFrameworks>
6-
<CopyLocalLockFileAssemblies Condition="'$(FakeBuild)'=='1'">true</CopyLocalLockFileAssemblies>
6+
<!--<CopyLocalLockFileAssemblies Condition="'$(FakeBuild)'=='1'">true</CopyLocalLockFileAssemblies>-->
77
</PropertyGroup>
88
<ItemGroup>
99
<ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />

‎src/Serializers/Nest.JsonNetSerializer/Nest.JsonNetSerializer.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup>
55
<TargetFrameworks>netstandard1.3</TargetFrameworks>
66
<!--<CopyLocalLockFileAssemblies Condition="'$(TargetFramework)'=='netstandard1.3'">true</CopyLocalLockFileAssemblies>-->
7-
<OldToolsVersion>2.0</OldToolsVersion>
87
</PropertyGroup>
98
<ItemGroup>
109
<ProjectReference Include="..\..\Nest\Nest.csproj" />

‎src/outputpath.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<OutputPath Condition="'$(OutputPathBaseDir)' != ''">$(OutputPathBaseDir)\$(MSBuildProjectName)\</OutputPath>

0 commit comments

Comments
 (0)