From cc2e9fbccb40d0782a6cbd98c0bcf8cee6986adc Mon Sep 17 00:00:00 2001
From: Mpdreamz <mpdreamz@gmail.com>
Date: Mon, 21 Mar 2016 09:47:44 +0100
Subject: [PATCH] Alternative to ..\{project}_Net45 folder side-side hack

that allows to develop project.json (the toolchain that produces our
artifacts) and csproj files (the best interface for continuous tests
through NCrunch) in tandem.

The old separate folder hack introduces strict restrictions on our
csproj based solution, adding files was forbidden because this would
expand the wildcards in the csproj and the file would end up in the
wrong folder.

Normally this side by side loading is riddled with nuget biting into
both worlds but luckily we use paket in the csproj world.

We didn't go for this solution initially because NCrunch while not
supporting project.json, it did have an undocumented check for
project.json files to kick off a different project resolution. Since
NCrunch 2.20 (released yesterday) this "special" check is removed and
NCrunch loads our csproj files that live next to project.json normally
again.

Our default work solution can now be Elasticsearch.sln again, while our
command line build still builds Elasticsearch.DNX.sln and we can use the
latter to investigate CoreCLR bugs/features.
---
 .../Benchmarking.csproj                       |  20 +++++++--------
 src/Benchmarking/Benchmarking.project.json    |   8 ++++++
 .../Benchmarking.project.lock.json            |  13 ++++++++++
 .../paket.references                          |   0
 .../CodeGeneration.LowLevelClient.csproj      |  21 +++++----------
 ...CodeGeneration.LowLevelClient.project.json |   8 ++++++
 ...eneration.LowLevelClient.project.lock.json |  13 ++++++++++
 .../paket.references                          |   0
 .../razormachine.readme.txt                   |   0
 .../Nest.Litterateur.csproj                   |  14 +++++-----
 .../Nest.Litterateur.project.json             |   8 ++++++
 .../Nest.Litterateur.project.lock.json        |  13 ++++++++++
 .../paket.references                          |   0
 .../Elasticsearch.Net.csproj                  |  14 +++++-----
 .../Elasticsearch.Net.project.json            |   8 ++++++
 .../Elasticsearch.Net.project.lock.json       |  13 ++++++++++
 .../paket.references                          |   0
 src/Elasticsearch.sln                         |  14 +++++-----
 src/{Nest_Net45 => Nest}/Nest.csproj          |  18 ++++++-------
 src/Nest/Nest.project.json                    |   8 ++++++
 src/Nest/Nest.project.lock.json               |  13 ++++++++++
 src/{Nest_Net45 => Nest}/paket.references     |   0
 ...hTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6 | Bin 135706 -> 0 bytes
 .../Profiling.csproj                          |  20 +++++++--------
 src/Profiling/Profiling.project.json          |   8 ++++++
 src/Profiling/Profiling.project.lock.json     |  13 ++++++++++
 .../paket.references                          |   0
 .../Cat/CatAliases/CatAliasesApiTests.cs      |   1 -
 src/{Tests_Net45 => Tests}/Tests.csproj       |  24 +++++++-----------
 src/Tests/Tests.project.json                  |   8 ++++++
 src/Tests/Tests.project.lock.json             |  13 ++++++++++
 src/{Tests_Net45 => Tests}/paket.references   |   0
 src/Tests/tests.yaml                          |   2 +-
 33 files changed, 209 insertions(+), 86 deletions(-)
 rename src/{Benchmarking_Net45 => Benchmarking}/Benchmarking.csproj (98%)
 create mode 100644 src/Benchmarking/Benchmarking.project.json
 create mode 100644 src/Benchmarking/Benchmarking.project.lock.json
 rename src/{Benchmarking_Net45 => Benchmarking}/paket.references (100%)
 rename src/CodeGeneration/{CodeGeneration.LowLevelClient_Net45 => CodeGeneration.LowLevelClient}/CodeGeneration.LowLevelClient.csproj (92%)
 create mode 100644 src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json
 create mode 100644 src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json
 rename src/CodeGeneration/{CodeGeneration.LowLevelClient_Net45 => CodeGeneration.LowLevelClient}/paket.references (100%)
 rename src/CodeGeneration/{CodeGeneration.LowLevelClient_Net45 => CodeGeneration.LowLevelClient}/razormachine.readme.txt (100%)
 rename src/CodeGeneration/{Nest.Litterateur_Net45 => Nest.Litterateur}/Nest.Litterateur.csproj (95%)
 create mode 100644 src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json
 create mode 100644 src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json
 rename src/CodeGeneration/{Nest.Litterateur_Net45 => Nest.Litterateur}/paket.references (100%)
 rename src/{Elasticsearch.Net_Net45 => Elasticsearch.Net}/Elasticsearch.Net.csproj (88%)
 create mode 100644 src/Elasticsearch.Net/Elasticsearch.Net.project.json
 create mode 100644 src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json
 rename src/{Elasticsearch.Net_Net45 => Elasticsearch.Net}/paket.references (100%)
 rename src/{Nest_Net45 => Nest}/Nest.csproj (94%)
 create mode 100644 src/Nest/Nest.project.json
 create mode 100644 src/Nest/Nest.project.lock.json
 rename src/{Nest_Net45 => Nest}/paket.references (100%)
 delete mode 100644 src/Nest_Net45/nCrunchTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6
 rename src/{Profiling_Net45 => Profiling}/Profiling.csproj (98%)
 create mode 100644 src/Profiling/Profiling.project.json
 create mode 100644 src/Profiling/Profiling.project.lock.json
 rename src/{Profiling_Net45 => Profiling}/paket.references (100%)
 rename src/{Tests_Net45 => Tests}/Tests.csproj (98%)
 create mode 100644 src/Tests/Tests.project.json
 create mode 100644 src/Tests/Tests.project.lock.json
 rename src/{Tests_Net45 => Tests}/paket.references (100%)

diff --git a/src/Benchmarking_Net45/Benchmarking.csproj b/src/Benchmarking/Benchmarking.csproj
similarity index 98%
rename from src/Benchmarking_Net45/Benchmarking.csproj
rename to src/Benchmarking/Benchmarking.csproj
index 8984457f2bf..ec1d0ac5181 100644
--- a/src/Benchmarking_Net45/Benchmarking.csproj
+++ b/src/Benchmarking/Benchmarking.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Benchmarking\bin\Debug\</OutputPath>
+    <OutputPath>..\Benchmarking\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Benchmarking\bin\Release\</OutputPath>
+    <OutputPath>..\Benchmarking\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,29 +43,27 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Benchmarking\**\*.cs">
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-	</Compile>
-    <None Include="..\Benchmarking\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{e97ccf40-0ba6-43fe-9f2d-58d454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Nest_Net45\Nest.csproj">
+    <ProjectReference Include="..\Nest\Nest.csproj">
       <Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
       <Name>Nest</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tests_Net45\Tests.csproj">
+    <ProjectReference Include="..\Tests\Tests.csproj">
       <Project>{37164c11-88ef-4428-803a-9aa24fb8b44d}</Project>
       <Name>Tests</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\.paket\paket.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -458,4 +456,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Benchmarking/Benchmarking.project.json b/src/Benchmarking/Benchmarking.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Benchmarking/Benchmarking.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Benchmarking/Benchmarking.project.lock.json b/src/Benchmarking/Benchmarking.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Benchmarking/Benchmarking.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Benchmarking_Net45/paket.references b/src/Benchmarking/paket.references
similarity index 100%
rename from src/Benchmarking_Net45/paket.references
rename to src/Benchmarking/paket.references
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/CodeGeneration.LowLevelClient.csproj b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
similarity index 92%
rename from src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/CodeGeneration.LowLevelClient.csproj
rename to src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
index aa25ed64f73..2d1b478ee47 100644
--- a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/CodeGeneration.LowLevelClient.csproj
+++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Debug\</OutputPath>
+    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Release\</OutputPath>
+    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -47,20 +47,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\CodeGeneration.LowLevelClient\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-	<Content Include="..\CodeGeneration.LowLevelClient\**\*.json" Exclude="..\CodeGeneration.LowLevelClient\project.json;..\CodeGeneration.LowLevelClient\project.lock.json;">
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-	</Content>
-    <None Include="..\CodeGeneration.LowLevelClient\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
-    <None Include="..\CodeGeneration.LowLevelClient\**\*.cshtml">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </None>
+    <None Include="**\*.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -162,4 +155,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/paket.references b/src/CodeGeneration/CodeGeneration.LowLevelClient/paket.references
similarity index 100%
rename from src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/paket.references
rename to src/CodeGeneration/CodeGeneration.LowLevelClient/paket.references
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/razormachine.readme.txt b/src/CodeGeneration/CodeGeneration.LowLevelClient/razormachine.readme.txt
similarity index 100%
rename from src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/razormachine.readme.txt
rename to src/CodeGeneration/CodeGeneration.LowLevelClient/razormachine.readme.txt
diff --git a/src/CodeGeneration/Nest.Litterateur_Net45/Nest.Litterateur.csproj b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj
similarity index 95%
rename from src/CodeGeneration/Nest.Litterateur_Net45/Nest.Litterateur.csproj
rename to src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj
index bb6f8d4dd14..d1bfecd7304 100644
--- a/src/CodeGeneration/Nest.Litterateur_Net45/Nest.Litterateur.csproj
+++ b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Nest.Litterateur\bin\Debug\</OutputPath>
+    <OutputPath>..\Nest.Litterateur\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Nest.Litterateur\bin\Release\</OutputPath>
+    <OutputPath>..\Nest.Litterateur\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -39,14 +39,12 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Nest.Litterateur\**\*.cs">
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-	</Compile>
-    <None Include="..\Nest.Litterateur\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -124,4 +122,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/Nest.Litterateur_Net45/paket.references b/src/CodeGeneration/Nest.Litterateur/paket.references
similarity index 100%
rename from src/CodeGeneration/Nest.Litterateur_Net45/paket.references
rename to src/CodeGeneration/Nest.Litterateur/paket.references
diff --git a/src/Elasticsearch.Net_Net45/Elasticsearch.Net.csproj b/src/Elasticsearch.Net/Elasticsearch.Net.csproj
similarity index 88%
rename from src/Elasticsearch.Net_Net45/Elasticsearch.Net.csproj
rename to src/Elasticsearch.Net/Elasticsearch.Net.csproj
index e80edfede46..74d58b5df98 100644
--- a/src/Elasticsearch.Net_Net45/Elasticsearch.Net.csproj
+++ b/src/Elasticsearch.Net/Elasticsearch.Net.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Elasticsearch.Net\bin\Debug\</OutputPath>
+    <OutputPath>..\Elasticsearch.Net\bin\Net45\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,11 +29,11 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Elasticsearch.Net\bin\Release\</OutputPath>
+    <OutputPath>..\Elasticsearch.Net\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\Elasticsearch.Net\bin\Release\Elasticsearch.Net.XML</DocumentationFile>
+    <DocumentationFile>..\Elasticsearch.Net\bin\Net45\Release\Elasticsearch.Net.XML</DocumentationFile>
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -54,9 +54,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Elasticsearch.Net\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="paket.references" />
@@ -65,7 +63,7 @@
     <Folder Include="Domain\Response\" />
   </ItemGroup> -->
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -73,4 +71,4 @@
   </Target>
   -->
   <Import Project="..\..\.paket\paket.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Elasticsearch.Net/Elasticsearch.Net.project.json b/src/Elasticsearch.Net/Elasticsearch.Net.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Elasticsearch.Net/Elasticsearch.Net.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json b/src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Elasticsearch.Net_Net45/paket.references b/src/Elasticsearch.Net/paket.references
similarity index 100%
rename from src/Elasticsearch.Net_Net45/paket.references
rename to src/Elasticsearch.Net/paket.references
diff --git a/src/Elasticsearch.sln b/src/Elasticsearch.sln
index d6d375f87f1..347c1d96fd4 100644
--- a/src/Elasticsearch.sln
+++ b/src/Elasticsearch.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest_Net45\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D5575-2347-4D3C-BF8C-3E38410C46CA}"
 	ProjectSection(SolutionItems) = preProject
@@ -23,21 +23,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Code Generation", "Code Generation", "{93331BEE-0AA0-47B7-B1D2-BD5BD31634D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGeneration.LowLevelClient", "CodeGeneration\CodeGeneration.LowLevelClient_Net45\CodeGeneration.LowLevelClient.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGeneration.LowLevelClient", "CodeGeneration\CodeGeneration.LowLevelClient\CodeGeneration.LowLevelClient.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net_Net45\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "scripts", "..\build\scripts\scripts.fsproj", "{28328694-2598-44D3-BB25-8B6C3FBDD3EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests_Net45\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Litterateur", "CodeGeneration\Nest.Litterateur_Net45\Nest.Litterateur.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Litterateur", "CodeGeneration\Nest.Litterateur\Nest.Litterateur.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{71B3D359-87E2-4F62-82A2-A624DD3BF402}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarking", "Benchmarking_Net45\Benchmarking.csproj", "{9BB0AB7E-F08E-4D3E-A9E7-7C71318E8666}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarking", "Benchmarking\Benchmarking.csproj", "{9BB0AB7E-F08E-4D3E-A9E7-7C71318E8666}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiling", "Profiling_Net45\Profiling.csproj", "{523B5383-B67D-462F-825D-FAE057E6B17D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiling", "Profiling\Profiling.csproj", "{523B5383-B67D-462F-825D-FAE057E6B17D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Nest_Net45/Nest.csproj b/src/Nest/Nest.csproj
similarity index 94%
rename from src/Nest_Net45/Nest.csproj
rename to src/Nest/Nest.csproj
index 3456aee9a1e..2f02c895d29 100644
--- a/src/Nest_Net45/Nest.csproj
+++ b/src/Nest/Nest.csproj
@@ -18,13 +18,13 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Nest\bin\Debug\</OutputPath>
+    <OutputPath>..\Nest\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DocumentationFile>..\Nest\bin\Debug\Nest.XML</DocumentationFile>
+    <DocumentationFile>..\Nest\bin\Net45\Debug\Nest.XML</DocumentationFile>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
@@ -32,12 +32,12 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>True</Optimize>
-    <OutputPath>..\Nest\bin\Release\</OutputPath>
+    <OutputPath>..\Nest\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>..\Nest\bin\Release\Nest.XML</DocumentationFile>
+    <DocumentationFile>..\Nest\bin\Net45\Release\Nest.XML</DocumentationFile>
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -56,9 +56,7 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Nest\**\*.cs" >
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -78,7 +76,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{E97CCF40-0BA6-43FE-9F2D-58D454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
@@ -87,7 +85,7 @@
     <None Include="paket.references" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -151,4 +149,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Nest/Nest.project.json b/src/Nest/Nest.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Nest/Nest.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Nest/Nest.project.lock.json b/src/Nest/Nest.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Nest/Nest.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Nest_Net45/paket.references b/src/Nest/paket.references
similarity index 100%
rename from src/Nest_Net45/paket.references
rename to src/Nest/paket.references
diff --git a/src/Nest_Net45/nCrunchTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6 b/src/Nest_Net45/nCrunchTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6
deleted file mode 100644
index cd162fb41f614b847edc79652a7f29cb5cb986a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 135706
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
O|KUtPUUmKLTJitQrF#qj

diff --git a/src/Profiling_Net45/Profiling.csproj b/src/Profiling/Profiling.csproj
similarity index 98%
rename from src/Profiling_Net45/Profiling.csproj
rename to src/Profiling/Profiling.csproj
index bb978d20260..2bd2cf18603 100644
--- a/src/Profiling_Net45/Profiling.csproj
+++ b/src/Profiling/Profiling.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Profiling\bin\Debug\</OutputPath>
+    <OutputPath>..\Profiling\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Profiling\bin\Release\</OutputPath>
+    <OutputPath>..\Profiling\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,29 +43,27 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Profiling\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-    <None Include="..\Profiling\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{e97ccf40-0ba6-43fe-9f2d-58d454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Nest_Net45\Nest.csproj">
+    <ProjectReference Include="..\Nest\Nest.csproj">
       <Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
       <Name>Nest</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tests_Net45\Tests.csproj">
+    <ProjectReference Include="..\Tests\Tests.csproj">
       <Project>{37164c11-88ef-4428-803a-9aa24fb8b44d}</Project>
       <Name>Tests</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\.paket\paket.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -636,4 +634,4 @@
   </Choose>
   <Import Project="..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props" Condition="Exists('..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props')" Label="Paket" />
   <Import Project="..\..\packages\JetBrains.Profiler.Kernel.Windows.Api\build\JetBrains.Profiler.Kernel.Windows.Api.Targets" Condition="Exists('..\..\packages\JetBrains.Profiler.Kernel.Windows.Api\build\JetBrains.Profiler.Kernel.Windows.Api.Targets')" Label="Paket" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Profiling/Profiling.project.json b/src/Profiling/Profiling.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Profiling/Profiling.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Profiling/Profiling.project.lock.json b/src/Profiling/Profiling.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Profiling/Profiling.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Profiling_Net45/paket.references b/src/Profiling/paket.references
similarity index 100%
rename from src/Profiling_Net45/paket.references
rename to src/Profiling/paket.references
diff --git a/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs b/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs
index 27dcd2cb713..51de4b522b5 100644
--- a/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs
+++ b/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs
@@ -28,5 +28,4 @@ protected override void ExpectResponse(ICatResponse<CatAliasesRecord> response)
 			response.Records.Should().NotBeEmpty().And.Contain(a => a.Alias == "projects-alias");
 		}
 	}
-
 }
diff --git a/src/Tests_Net45/Tests.csproj b/src/Tests/Tests.csproj
similarity index 98%
rename from src/Tests_Net45/Tests.csproj
rename to src/Tests/Tests.csproj
index 1a7901fa963..7431d127d9e 100644
--- a/src/Tests_Net45/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Tests\bin\Debug\</OutputPath>
+    <OutputPath>..\Tests\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Tests\bin\Release\</OutputPath>
+    <OutputPath>..\Tests\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,24 +43,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Tests\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-    <None Include="..\Tests\**\*.asciidoc">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </None>
+    <Compile Include=".\**\*.cs" />
+    <None Include="**\*.asciidoc" />
     <None Include="paket.references" />
-    <Content Include="..\Tests\**\*.png">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Content>
-    <None Include="..\Tests\tests.yaml" />
+    <Content Include="**\*.png" />
+    <None Include="tests.yaml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{E97CCF40-0BA6-43FE-9F2D-58D454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Nest_Net45\Nest.csproj">
+    <ProjectReference Include="..\Nest\Nest.csproj">
       <Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
       <Name>Nest</Name>
     </ProjectReference>
@@ -790,4 +784,4 @@
     </When>
   </Choose>
   <Import Project="..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props" Condition="Exists('..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props')" Label="Paket" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Tests/Tests.project.json b/src/Tests/Tests.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Tests/Tests.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Tests/Tests.project.lock.json b/src/Tests/Tests.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Tests/Tests.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Tests_Net45/paket.references b/src/Tests/paket.references
similarity index 100%
rename from src/Tests_Net45/paket.references
rename to src/Tests/paket.references
diff --git a/src/Tests/tests.yaml b/src/Tests/tests.yaml
index 74cf2393ae3..0ea63a0af78 100644
--- a/src/Tests/tests.yaml
+++ b/src/Tests/tests.yaml
@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: m
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 2.2.0
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running