Merge branch 'master' of github.com:elasticsearch/elasticsearch-net

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -156,7 +156,7 @@ public static void PatchMethod(CsharpMethod method)
 					.ToDictionary(k => k.Key, v => v.Value);
 			}
 // ReSharper disable once EmptyGeneralCatchClause
-			catch (Exception e)
+			catch 
 			{
 			}
 

src/CodeGeneration/CodeGeneration.YamlTestsRunner/CodeGeneration.YamlTestsRunner.csproj

@@ -107,7 +107,7 @@
   <ItemGroup>
     <Content Include="razormachine.readme.txt" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- 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">

src/CodeGeneration/CodeGeneration.YamlTestsRunner/YamlTestsGenerator.cs

@@ -164,19 +164,12 @@ private static IEnumerable<TestSuite> ParseYaml(string yaml)
 			foreach (var test in tests.Where(t=>!t.IsNullOrEmpty()))
 			{
 				++i;
-				try
+				using (var tx = new StringReader(test))
 				{
-					using (var tx = new StringReader(test))
-					{
-						var parsed = deserializer.Deserialize<YamlTestSuite>(tx);
-						var suite = TestSuite.CreateFrom(parsed, yaml);
-						suite.Description += i;
-						r.Add(suite);
-					}
-				}
-				catch (Exception exception)
-				{
-					throw;
+					var parsed = deserializer.Deserialize<YamlTestSuite>(tx);
+					var suite = TestSuite.CreateFrom(parsed, yaml);
+					suite.Description += i;
+					r.Add(suite);
 				}
 			}
 			return r;

src/Connections/Elasticsearch.Net.Connection.HttpClient/Elasticsearch.Net.Connection.HttpClient.csproj

@@ -77,7 +77,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\dep\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\dep\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
     <Error Condition="!Exists('..\..\..\dep\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />

src/Connections/Elasticsearch.Net.Connection.Thrift/Elasticsearch.Net.Connection.Thrift.csproj

@@ -33,6 +33,7 @@
     <Optimize>False</Optimize>
     <DocumentationFile>bin\Debug\Elasticsearch.Net.Connection.Thrift.xml</DocumentationFile>
     <UseVSHostingProcess>true</UseVSHostingProcess>
+    <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -137,7 +138,7 @@
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>
     <!--<PreBuildEvent>IF NOT EXIST "$(SolutionDir)..\build\keys\keypair.snk" (CD "$(SolutionDir).." &amp;&amp; "build.bat" CreateKeysIfAbsent &amp;&amp; CD %25~dp0)

src/Connections/Elasticsearch.Net.Connection.Thrift/Protocol/TBase.cs

@@ -21,14 +21,10 @@ namespace Elasticsearch.Net.Connection.Thrift.Protocol
 {
 	public interface TBase
 	{
-		///
-		/// Reads the TObject from the given input protocol.
-		///
+		///<summary>Reads the TObject from the given input protocol.</summary>
 		void Read(TProtocol tProtocol);
 
-		///
-		/// Writes the objects out to the protocol
-		///
+		///<summary>Writes the objects out to the protocol.</summary>
 		void Write(TProtocol tProtocol);
 	}
 }

src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs

@@ -12,7 +12,6 @@ public class SniffingConnectionPool : StaticConnectionPool
 		private readonly ReaderWriterLockSlim _readerWriter = new ReaderWriterLockSlim();
 
 		private bool _seenStartup = false;
-		private bool _canUpdateNodeList;
 
 		public override bool AcceptsUpdates { get { return true; } }
 

src/Elasticsearch.Net/Elasticsearch.Net.csproj

@@ -55,7 +55,6 @@
     <Compile Include="Domain\IHideObjectMembers.cs" />
     <Compile Include="Domain\IRequestParameters.cs" />
     <Compile Include="Domain\VoidResponse.cs" />
-    <Compile Include="Extensions\TaskExtensions.cs" />
     <Compile Include="Providers\DateTimeProvider.cs" />
     <Compile Include="Connection\HttpConnection.cs" />
     <Compile Include="Connection\ConnectionError.cs" />