#ifdef indentation

Author: Mpdreamz

build/scripts/Building.fsx

@@ -18,7 +18,7 @@ type Build() =
         |> Seq.iter(fun p -> 
             let path = Paths.ProjectJson p.Name
             let o = Paths.ProjectOutputFolder p DotNetFramework.NetStandard1_3
-            DotNet.Exec ["restore"; path; "--verbosity Warning"]
+            DotNet.Exec ["restore"; path]
             DotNet.Exec ["build"; path; "--configuration Release"; "-o"; o; "-f"; DotNetFramework.NetStandard1_3.Identifier.MSBuild]
         )
 

build/scripts/Testing.fsx

@@ -14,11 +14,11 @@ module Tests =
         DotNetProject.All
         |> Seq.iter(fun p -> 
             let path = Paths.ProjectJson p.Name
-            DotNet.Exec ["restore"; path; "--verbosity Warning"]
+            DotNet.Exec ["restore"; path]
         )
 
         let testPath = Paths.Source "Tests/project.json"
-        DotNet.Exec ["restore"; testPath; "--verbosity Warning"]
+        DotNet.Exec ["restore"; testPath]
         DotNet.Exec ["build"; testPath; "--configuration Release"; "-f"; "netcoreapp1.0"]
         DotNet.Exec ["test"; testPath; "-parallel"; parallelization; "-xml"; Paths.Output("TestResults-Core-Clr.xml")]
 

src/Elasticsearch.sln

@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
 		..\build.sh = ..\build.sh
 		..\contributing.md = ..\contributing.md
 		..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec
+		global.json = global.json
 		..\license.txt = ..\license.txt
 		..\build\NEST.nuspec = ..\build\NEST.nuspec
 		..\paket.bat = ..\paket.bat

src/Tests/ClientConcepts/Connection/CustomConnections.cs

@@ -55,6 +55,7 @@ public void OverrideHow()
 		 * Remember though that we reuse TCP connections so changing this to something really high should only be done with careful consideration.
 		 */
 
+#if !DOTNETCORE
 		public class MySpecialHttpConnection : HttpConnection
 		{
 			protected override void AlterServicePoint(ServicePoint requestServicePoint, RequestData requestData)
@@ -63,7 +64,7 @@ protected override void AlterServicePoint(ServicePoint requestServicePoint, Requ
 				requestServicePoint.ConnectionLimit = 10000;
 				requestServicePoint.UseNagleAlgorithm = true;
 			}
-
 		}
+#endif
 	}
 }

src/Tests/Framework/Xunit/TestAssemblyRunner.cs

@@ -52,12 +52,12 @@ orderby g.Count() descending
 
 			//If we are not running any integration tests we do not care about only keeping a single IClusterFixture
 			//active at a time, so let xunit do what it does best.
-			if (!TestClient.Configuration.RunIntegrationTests)
-			{
-				var result = await base.RunTestCollectionsAsync(messageBus, cancellationTokenSource);
-				foreach (var g in grouped) g.Key?.Dispose();
-				return result;
-			}
+			//if (!TestClient.Configuration.RunIntegrationTests)
+			//{
+			//	var result = await base.RunTestCollectionsAsync(messageBus, cancellationTokenSource);
+			//	foreach (var g in grouped) g.Key?.Dispose();
+			//	return result;
+			//}
 
 			//threading guess
 			var defaultMaxConcurrency = Environment.ProcessorCount * 4;