Remove random old connection usage and add explict net461 testing back

Author: Mpdreamz

src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs

@@ -29,6 +29,8 @@ internal class WebProxy : IWebProxy
 		public bool IsBypassed(Uri host) => host.IsLoopback;
 	}
 
+
+	/// <summary> The default IConnection implementation. Uses <see cref="HttpClient"/>.</summary>
 	public class HttpConnection : IConnection
 	{
 		private readonly object _lock = new object();

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -12,6 +12,7 @@
 
 namespace Elasticsearch.Net
 {
+	/// <summary> The default IConnection implementation. Uses <see cref="HttpWebRequest"/> on the current .NET desktop framework.</summary>
 	public class HttpConnection : HttpWebRequestConnection
 	{
 	}

src/Tests/Tests.Configuration/EnvironmentConfiguration.cs

@@ -34,7 +34,6 @@ public EnvironmentConfiguration()
 			{
 				SourceSerializer = RandomBoolConfig("SOURCESERIALIZER", randomizer),
 				TypedKeys = RandomBoolConfig("TYPEDKEYS", randomizer),
-				OldConnection = RandomBoolConfig("OLDCONNECTION", randomizer),
 			};
 		}
 

src/Tests/Tests.Configuration/ITestConfiguration.cs

@@ -22,7 +22,5 @@ public class RandomConfiguration
 	{
 		public bool SourceSerializer { get; set; }
 		public bool TypedKeys { get; set; }
-		public bool OldConnection { get; set; }
 	}
-
 }

src/Tests/Tests.Configuration/YamlConfiguration.cs

@@ -41,7 +41,6 @@ public YamlConfiguration(string configurationFile)
 			{
 				SourceSerializer = this.RandomBool("source_serializer", randomizer),
 				TypedKeys = this.RandomBool("typed_keys", randomizer),
-				OldConnection = this.RandomBool("old_connection", randomizer)
 			};
 		}
 

src/Tests/Tests.Core/Client/Settings/TestConnectionSettings.cs

@@ -38,7 +38,6 @@ public TestConnectionSettings(
 				: ConnectionConfiguration.DefaultConnectionLimit;
 
 		internal ConnectionSettings ApplyTestSettings() => this
-			.ApplyFiddlerProxyWhenNeeded()
 			//TODO make this random
 			//.EnableHttpCompression()
 #if DEBUG
@@ -54,13 +53,6 @@ internal ConnectionSettings ApplyTestSettings() => this
 				foreach (var d in r.DeprecationWarnings) XunitRunState.SeenDeprecations.Add(d);
 			});
 
-		private ConnectionSettings ApplyFiddlerProxyWhenNeeded()
-		{
-			if (!TestConfiguration.Instance.Random.OldConnection) return this;
-			if (!RunningFiddler) return this;
-			return this.Proxy(new Uri("http://localhost:8888"), null, null);
-		}
-
 		private static SourceSerializerFactory CreateSerializerFactory(SourceSerializerFactory provided)
 		{
 			if (provided != null) return provided;

src/Tests/Tests.Core/Extensions/TestConfigurationExtensions.cs

@@ -8,7 +8,7 @@ public static class TestConfigurationExtensions
 	{
 		//on this branch HttpConnection is either webrequest or httpclient based depending on the TFM
 		private static IConnection CreateLiveConnection(this ITestConfiguration configuration) =>
-			configuration.Random.OldConnection ? (IConnection) new HttpWebRequestConnection() : new HttpConnection();
+			new HttpConnection();
 
 		public static IConnection CreateConnection(this ITestConfiguration configuration, bool forceInMemory = false) =>
 			configuration.RunIntegrationTests && !forceInMemory ? configuration.CreateLiveConnection() : new InMemoryConnection();

src/Tests/Tests.Core/Xunit/NestXunitRunOptions.cs

@@ -48,7 +48,6 @@ private static void DumpConfiguration()
 			Console.WriteLine($" - Random:");
 			Console.WriteLine($" \t- {nameof(config.Random.SourceSerializer)}: {config.Random.SourceSerializer}");
 			Console.WriteLine($" \t- {nameof(config.Random.TypedKeys)}: {config.Random.TypedKeys}");
-			Console.WriteLine($" \t- {nameof(config.Random.OldConnection)}: {config.Random.OldConnection}");
 			Console.WriteLine(new string('-', 20));
 
 		}
@@ -115,7 +114,6 @@ private static string ReproduceCommandLine(ConcurrentBag<Tuple<string, string>>
 
 			AppendExplictConfig(nameof(RandomConfiguration.SourceSerializer), sb);
 			AppendExplictConfig(nameof(RandomConfiguration.TypedKeys), sb);
-			AppendExplictConfig(nameof(RandomConfiguration.OldConnection), sb);
 
 			if (runningIntegrations)
 				sb.Append("integrate ")

src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs

@@ -56,25 +56,17 @@ [I] public async Task SingleInstanceOfHttpClient()
 			connection.ClientCount.Should().Be(1);
 		}
 
-	    [I] public async Task MultipleInstancesOfHttpClientWhenRequestTimeoutChanges()
-		{
-			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(TimeSpan.FromSeconds(30)));
-		}
+	    [I] public async Task MultipleInstancesOfHttpClientWhenRequestTimeoutChanges() =>
+		    await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(TimeSpan.FromSeconds(30)));
 
-		[I] public async Task MultipleInstancesOfHttpClientWhenProxyChanges()
-		{
+	    [I] public async Task MultipleInstancesOfHttpClientWhenProxyChanges() =>
 			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(proxyAddress: new Uri("http://localhost:9400")));
-		}
 
-		[I] public async Task MultipleInstancesOfHttpClientWhenAutomaticProxyDetectionChanges()
-		{
+	    [I] public async Task MultipleInstancesOfHttpClientWhenAutomaticProxyDetectionChanges() =>
 			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(disableAutomaticProxyDetection: true));
-		}
 
-		[I] public async Task MultipleInstancesOfHttpClientWhenHttpCompressionChanges()
-		{
+	    [I] public async Task MultipleInstancesOfHttpClientWhenHttpCompressionChanges() =>
 			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(httpCompression: true));
-		}
 
 	    private static async Task MultipleInstancesOfHttpClientWhen(Func<RequestData> differentRequestData)
 	    {

src/Tests/Tests/Tests.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <VersionPrefix>6.0.0</VersionPrefix>
     <VersionSuffix>alpha</VersionSuffix>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>