Skip to content

Commit 40d7d3d

Browse files
committed
small sln updates so vs2015.5 loads Nest.JsonNetSerializer properly
1 parent f871fc4 commit 40d7d3d

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/Elasticsearch.sln

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.6
4+
VisualStudioVersion = 15.0.27130.2003
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nest", "Nest\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D5575-2347-4D3C-BF8C-3E38410C46CA}"
97
ProjectSection(SolutionItems) = preProject
108
..\.editorconfig = ..\.editorconfig
119
..\.gitignore = ..\.gitignore
1210
..\.travis.yml = ..\.travis.yml
11+
..\appveyor.yml = ..\appveyor.yml
1312
..\build.bat = ..\build.bat
1413
..\build.sh = ..\build.sh
1514
..\build\Clients.Common.targets = ..\build\Clients.Common.targets
1615
..\contributing.md = ..\contributing.md
1716
..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec
1817
..\global.json = ..\global.json
1918
..\license.txt = ..\license.txt
19+
..\build\NEST.JsonNetSerializer.nuspec = ..\build\NEST.JsonNetSerializer.nuspec
2020
..\build\NEST.nuspec = ..\build\NEST.nuspec
2121
..\paket.bat = ..\paket.bat
2222
..\paket.dependencies = ..\paket.dependencies
2323
..\readme.md = ..\readme.md
24-
..\build\NEST.JsonNetSerializer.nuspec = ..\build\NEST.JsonNetSerializer.nuspec
25-
..\appveyor.yml = ..\appveyor.yml
2624
EndProjectSection
2725
EndProject
2826
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeGeneration", "CodeGeneration", "{93331BEE-0AA0-47B7-B1D2-BD5BD31634D1}"
2927
EndProject
28+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serializers", "Serializers", "{14241027-0A92-466D-B024-E0063F338915}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nest", "Nest\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
31+
EndProject
3032
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiGenerator", "CodeGeneration\ApiGenerator\ApiGenerator.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
3133
EndProject
3234
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elasticsearch.Net", "Elasticsearch.Net\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
@@ -37,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj
3739
EndProject
3840
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocGenerator", "CodeGeneration\DocGenerator\DocGenerator.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
3941
EndProject
40-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serializers", "Serializers", "{14241027-0A92-466D-B024-E0063F338915}"
41-
EndProject
4242
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.JsonNetSerializer", "Serializers\Nest.JsonNetSerializer\Nest.JsonNetSerializer.csproj", "{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}"
4343
EndProject
4444
Global
@@ -69,10 +69,6 @@ Global
6969
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Debug|Any CPU.Build.0 = Debug|Any CPU
7070
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Release|Any CPU.ActiveCfg = Release|Any CPU
7171
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Release|Any CPU.Build.0 = Release|Any CPU
72-
{64D927D4-13ED-452D-9B76-8E00FEAFC587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73-
{64D927D4-13ED-452D-9B76-8E00FEAFC587}.Debug|Any CPU.Build.0 = Debug|Any CPU
74-
{64D927D4-13ED-452D-9B76-8E00FEAFC587}.Release|Any CPU.ActiveCfg = Release|Any CPU
75-
{64D927D4-13ED-452D-9B76-8E00FEAFC587}.Release|Any CPU.Build.0 = Release|Any CPU
7672
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7773
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
7874
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -87,4 +83,7 @@ Global
8783
{98400F59-4BA8-4534-9A78-9C7FA0B42901} = {93331BEE-0AA0-47B7-B1D2-BD5BD31634D1}
8884
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD} = {14241027-0A92-466D-B024-E0063F338915}
8985
EndGlobalSection
86+
GlobalSection(ExtensibilityGlobals) = postSolution
87+
SolutionGuid = {B3427E39-0C06-4A56-88E2-DCB730B82785}
88+
EndGlobalSection
9089
EndGlobal

src/Tests/tests.default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# tracked by git).
66

77
# mode either u (unit test), i (integration test) or m (mixed mode)
8-
mode: i
8+
mode: u
99
# the elasticsearch version that should be started
1010
# Can be a snapshot version of sonatype or "latest" to get the latest snapshot of sonatype
1111
elasticsearch_version: 6.0.0

0 commit comments

Comments
 (0)