post merge build failures

Author: Mpdreamz

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -505,9 +505,7 @@
     <Compile Include="Search\Suggest\PhraseSuggestTests.cs" />
     <Compile Include="Search\Suggest\TermSuggestTests.cs" />
     <Compile Include="Settings\UsePrettyResponseTests.cs" />
-    <Compile Include="Template\TemplateSpikeTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="Template\TemplateSpikeTests.cs" />
     <Compile Include="TestElasticClient.cs" />
     <Compile Include="Core\Update\UpdateTests.cs" />
   </ItemGroup>
@@ -1249,7 +1247,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Tests/Nest.Tests.Unit/Template/TemplateSpikeTests.cs

@@ -77,15 +77,6 @@ public void SearchTemplateByFile()
 			);
 		}
 
-		public static Func<SortFieldDescriptor<T>, IFieldSort> If<T>(string variable, Func<SortFieldDescriptor<T>, IFieldSort> s)
-		where T : class
-		{
-			return new Func<SortFieldDescriptor<T>, IFieldSort>(inner => new IfSortFieldDescriptor(variable, s(inner)));
-		}
-		public static QueryContainer If(string variable, QueryContainer o)
-		{
-			return new IfQueryContainer(variable, o);
-		}
 
 		[Test]
 		public void SearchTemplateById()
@@ -110,32 +101,4 @@ public static IEnumerable<string> Array(string name)
 			};
 		}
 	}
-
-	public class IfTemplateConverter : JsonConverter
-	{
-		public override bool CanWrite { get { return true; } }
-
-		public override bool CanRead { get { return false; } }
-
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			var v = value as IIfTemplate;
-			if (v == null) writer.WriteNull();
-			var l = writer.Path.Split(new[] { '.' }).Length + 1;
-			writer.WriteRaw("{{#" + v.Variable + "}}");
-			serializer.Serialize(writer, v.Instance);
-			writer.WriteRaw("{{/" + v.Variable + "}}");
-
-		}
-
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			return null;
-		}
-
-		public override bool CanConvert(Type objectType)
-		{
-			return true;
-		}
-	}
 }