Remove multi targeting of net461

Elasticsearch.Net were previously hedging their bets on using HttpClient in Fullframework. They were was using HttpWebRequest and httpclient in net standard, there is no longer this compile split, so we can remove it from here too.

Author: William Denton

src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/ElasticSearch.Net.Aws.IntegrationTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <AssemblyName>ElasticSearch.Net.Aws.IntegrationTests</AssemblyName>
     <PackageId>ElasticSearch.Net.Aws.IntegrationTests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -22,11 +22,6 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>

src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/ElasticSearch.Net.Aws.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <AssemblyName>ElasticSearch.Net.Aws.Tests</AssemblyName>
     <PackageId>ElasticSearch.Net.Aws.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -20,18 +20,10 @@
     <PackageReference Include="NEST" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
     <PackageReference Include="Elasticsearch.Net" Version="6.0.1" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>

src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/SignUtilTests.cs

@@ -18,19 +18,11 @@ public void SetUp()
         {
             var encoding = new UTF8Encoding(false);
             _sampleBody = encoding.GetBytes("Action=ListUsers&Version=2010-05-08");
-#if NETCOREAPP
             var request = new System.Net.Http.HttpRequestMessage(System.Net.Http.HttpMethod.Post, "https://iam.amazonaws.com/");
             request.Content = new System.Net.Http.ByteArrayContent(_sampleBody);
             request.Content.Headers.TryAddWithoutValidation("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             request.Headers.TryAddWithoutValidation("X-Amz-Date", "20110909T233600Z");
             _sampleRequest = new HttpRequestMessageAdapter(request);
-#elif NET461
-            var request = System.Net.WebRequest.CreateHttp("https://iam.amazonaws.com/");
-            request.Method = "POST";
-            request.ContentType = "application/x-www-form-urlencoded; charset=utf-8";
-            request.Headers["X-Amz-Date"] = "20110909T233600Z";
-            _sampleRequest = new HttpWebRequestAdapter(request);
-#endif
         }
 
         [Test]

src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/AwsHttpConnection.cs

@@ -43,21 +43,12 @@ public AwsHttpConnection() : this(
         {
         }
 
-#if !NETSTANDARD
-        protected override System.Net.HttpWebRequest CreateHttpWebRequest(RequestData requestData)
-        {
-            var request = base.CreateHttpWebRequest(requestData);
-            SignRequest(new HttpWebRequestAdapter(request), requestData);
-            return request;
-        }
-#else
         protected override HttpRequestMessage CreateHttpRequestMessage(RequestData requestData)
         {
             var request = base.CreateHttpRequestMessage(requestData);
             SignRequest(new HttpRequestMessageAdapter(request), requestData);
             return request;
         }
-#endif
 
         private void SignRequest(IRequest request, RequestData requestData)
         {

src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>6.1.0</VersionPrefix>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Elasticsearch.Net.Aws</AssemblyName>
     <PackageId>Elasticsearch.Net.Aws</PackageId>
     <PackageVersion>6.1.0</PackageVersion>
@@ -29,17 +29,6 @@
     <PackageReference Include="AWSSDK.Core" Version="3.3.17.9" />
     <PackageReference Include="Elasticsearch.Net" Version="6.*" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Web" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.1.2" />
   </ItemGroup>
 

src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/HttpWebRequestAdapter.cs

@@ -157,18 +157,15 @@ private static void WriteSignedHeaders(Dictionary<string, string> canonicalHeade
             }
         }
 
-#if !NETSTANDARD
-         private static NameValueCollection ParseQueryString(string query) =>
-            System.Web.HttpUtility.ParseQueryString(query);
-#else
+
         private static NameValueCollection ParseQueryString(string query) =>
             Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(query)
                 .Aggregate(new NameValueCollection(), (col, kv) =>
                 {
                     kv.Value.ToList().ForEach(v => col.Add(kv.Key, v));
                     return col;
                 });
-#endif
+
         public static string GetCanonicalQueryString(this Uri uri)
         {
             if (string.IsNullOrWhiteSpace(uri.Query)) return string.Empty;