General cleanup

Author: Nick Craver

.editorconfig

@@ -77,4 +77,7 @@ csharp_new_line_before_else = true
 csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_anonymous_types = true
+
+# RCS1090: Call 'ConfigureAwait(false)'.
+dotnet_diagnostic.RCS1090.severity = silent

src/Directory.Build.props

@@ -12,15 +12,15 @@
     <Authors>Stack Exchange</Authors>
     <PackageId>$(AssemblyName)</PackageId>
     <Copyright>Stack Exchange, Inc. 2018</Copyright>
-    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/StackExchange/StackExchange.Utils</PackageProjectUrl>
     <RepositoryUrl>https://github.com/StackExchange/StackExchange.Utils</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.105" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.28" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 </Project>

src/StackExchange.Utils.Http/DefaultHttpClientPool.cs

@@ -90,8 +90,8 @@ public bool Equals(HttpClientCacheKey other)
             public override int GetHashCode()
             {
                 var hashCode = 647927907;
-                hashCode = hashCode * -1521134295 + EqualityComparer<TimeSpan>.Default.GetHashCode(Timeout);
-                hashCode = hashCode * -1521134295 + EqualityComparer<IWebProxy>.Default.GetHashCode(Proxy);
+                hashCode = (hashCode * -1521134295) + EqualityComparer<TimeSpan>.Default.GetHashCode(Timeout);
+                hashCode = (hashCode * -1521134295) + EqualityComparer<IWebProxy>.Default.GetHashCode(Proxy);
                 return hashCode;
             }
 

src/StackExchange.Utils.Http/Extensions.Expect.cs

@@ -18,9 +18,8 @@ public static IRequestBuilder<bool> ExpectHttpSuccess(this IRequestBuilder build
             builder.WithHandler(responseMessage => Task.FromResult(responseMessage.IsSuccessStatusCode));
 
         /// <summary>
-        /// Holds handlers for ExpectJson(T) calls, so we don't re-create them in the common "default Options" case.
-        ///
-        /// Without this, we create a new Func for each ExpectJson call even
+        /// <para>Holds handlers for ExpectJson(T) calls, so we don't re-create them in the common "default Options" case.</para>
+        /// <para>Without this, we create a new Func for each ExpectJson call even</para>
         /// </summary>
         /// <typeparam name="T">The type being deserialized.</typeparam>
         private static class JsonHandler<T>

src/StackExchange.Utils.Http/Extensions.Modifier.cs

@@ -78,6 +78,7 @@ public static IRequestBuilder WithoutLogging(this IRequestBuilder builder, IEnum
         }
 
         private static readonly ConcurrentDictionary<HttpStatusCode, ImmutableHashSet<HttpStatusCode>> _ignoreCache = new ConcurrentDictionary<HttpStatusCode, ImmutableHashSet<HttpStatusCode>>();
+
         /// <summary>
         /// Doesn't log an error when the response's HTTP status code is <paramref name="ignoredStatusCode"/>.
         /// </summary>
@@ -125,7 +126,7 @@ public static IRequestBuilder AddHeader(this IRequestBuilder builder, string nam
             }
             return builder;
         }
-        
+
         /// <summary>
         /// Adds a single header without Validation against known Header types.
         /// (ideal if you have different interpretation to the spec for any known types)
@@ -141,7 +142,6 @@ public static IRequestBuilder AddHeaderWithoutValidation(this IRequestBuilder bu
                 try
                 {
                     builder.Message.Headers.TryAddWithoutValidation(name, value);
-
                 }
                 catch (Exception e)
                 {

src/StackExchange.Utils.Http/Extensions.Send.cs

@@ -41,7 +41,6 @@ public static IRequestBuilder SendForm(this IRequestBuilder builder, NameValueCo
         public static IRequestBuilder SendHtml(this IRequestBuilder builder, string html) =>
             SendContent(builder, new StringContent(html, Encoding.UTF8, "text/html"));
 
-
         /// <summary>
         /// Adds JSON (Jil-serialized) content as the body for this request.
         /// </summary>

src/StackExchange.Utils.Http/Extensions.Verbs.cs

@@ -45,7 +45,7 @@ public static Task<HttpCallResponse<T>> PostAsync<T>(this IRequestBuilder<T> bui
         /// <returns>A <see cref="HttpCallResponse{T}"/> to consume.</returns>
         public static Task<HttpCallResponse<T>> PutAsync<T>(this IRequestBuilder<T> builder, CancellationToken cancellationToken = default) =>
             Http.SendAsync(builder, HttpMethod.Put, cancellationToken);
-            
+
         /// <summary>
         /// Issue the request as a PATCH.
         /// </summary>

src/StackExchange.Utils.Http/Http.cs

@@ -86,15 +86,10 @@ internal static async Task<HttpCallResponse<T>> SendAsync<T>(IRequestBuilder<T>
                 exception = ex;
             }
 
-            var result = default(HttpCallResponse<T>);
-            if (response == null)
-            {
-                result = HttpCallResponse.Create<T>(request, exception);
-            }
-            else
-            {
-                result = HttpCallResponse.Create<T>(response, exception);
-            }
+            // Use the response if we have it - request if not
+            var result = response != null
+                ? HttpCallResponse.Create<T>(response, exception)
+                : HttpCallResponse.Create<T>(request, exception);
 
             // Add caller member bits to the exception data regardless of where it's eventually logged.
             (builder.Inner as HttpBuilder)?.AddExceptionData(exception);

src/StackExchange.Utils.Http/HttpSettings.cs

@@ -57,12 +57,13 @@ public class HttpSettings
         public TimeSpan DefaultTimeout { get; set; } = TimeSpan.FromSeconds(30);
 
         /// <summary>
-        /// The default Proxy to use when making requests.
-        /// 
+        /// <para>The default Proxy to use when making requests.</para>
+        /// <para>
         /// This should create a new instance of a proxy when called,
         /// so that modifications don't affect the default (e.g.,
         /// changing Proxy.Credentials on a builder.Proxy should
         /// not affect the Proxy.Credentials used by default)
+        /// </para>
         /// </summary>
         public Func<IWebProxy> DefaultProxyFactory { get; set; } = null;
 

tests/StackExchange.Utils.Tests/HttpBinResponse.cs

@@ -3,16 +3,17 @@
 
 namespace StackExchange.Utils.Tests
 {
+    [DataContract]
     public class HttpBinResponse
     {
         [DataMember(Name = "args")]
-        public Dictionary<string, string> args { get; set; }
+        public Dictionary<string, string> Args { get; set; }
 
         [DataMember(Name = "data")]
         public string Data { get; set; }
 
         [DataMember(Name = "files")]
-        public Dictionary<string, string> files { get; set; }
+        public Dictionary<string, string> Files { get; set; }
 
         [DataMember(Name = "form")]
         public Dictionary<string, string> Form { get; set; }

tests/StackExchange.Utils.Tests/HttpTests.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -25,7 +24,6 @@ public async Task BasicCreation()
         [Fact]
         public async Task BasicGet()
         {
-            var guid = Guid.NewGuid().ToString();
             var result = await Http.Request("https://httpbin.org/get")
                                     .ExpectJson<HttpBinResponse>()
                                     .GetAsync();
@@ -124,7 +122,7 @@ public async Task Timeouts()
             Assert.Equal("https://httpbin.org/delay/10", err.Uri.ToString());
             Assert.Null(err.StatusCode);
         }
-        
+
         [Fact]
         public async Task AddHeaderWithoutValidation()
         {