Fixing StyleCop issues

Author: Tomas Urbonaitis

GVFS/GVFS.Common/Git/GitProcess.cs

@@ -313,6 +313,7 @@ public bool TryGetConfigUrlMatch(string section, string repositoryUrl, out Dicti
                 configSettings = null;
                 return false;
             }
+
             configSettings = GitConfigHelper.ParseKeyValues(result.Output, ' ');
             return true;
         }

GVFS/GVFS.Common/Git/GitSslSettings.cs

@@ -2,38 +2,39 @@
 using System.Linq;
 
 namespace GVFS.Common.Git
-{
+{
     public struct GitSslSettings
     {
+        public readonly string SslCertificate;
+        public readonly bool SslCertPasswordProtected;
+
         public GitSslSettings(IDictionary<string, GitConfigSetting> configSettings)
         {
             if (configSettings != null)
             {
                 if (configSettings.TryGetValue(GitConfigSetting.SslCert, out var sslCerts))
                 {
-                    SslCertificate = sslCerts.Values.Single();
+                    this.SslCertificate = sslCerts.Values.Single();
                 }
                 else
                 {
-                    SslCertificate = default(string);
+                    this.SslCertificate = default(string);
                 }
 
                 if (configSettings.TryGetValue(GitConfigSetting.SslCertPasswordProtected, out var isSslCertPasswordProtected))
                 {
-                    SslCertPasswordProtected = isSslCertPasswordProtected.Values.Select(bool.Parse).Single();
+                    this.SslCertPasswordProtected = isSslCertPasswordProtected.Values.Select(bool.Parse).Single();
                 }
                 else
                 {
-                    SslCertPasswordProtected = false;
+                    this.SslCertPasswordProtected = false;
                 }
             }
             else
             {
-                SslCertificate = default(string);
-                SslCertPasswordProtected = default(bool);
+                this.SslCertificate = default(string);
+                this.SslCertPasswordProtected = default(bool);
             }
         }
-        public readonly string SslCertificate;
-        public readonly bool SslCertPasswordProtected;
     }
 }

GVFS/GVFS.Common/Http/ConfigHttpRequestor.cs

@@ -88,10 +88,12 @@ public bool TryQueryGVFSConfig(bool logErrors, out ServerGVFSConfig serverGVFSCo
                 httpStatus = httpException.StatusCode;
             }
 
-            this.Tracer.RelatedError(new EventMetadata
-            {
-                {"Exception", output.Error}
-            }, "TryQueryGVFSConfig failed");
+            this.Tracer.RelatedError(
+                new EventMetadata
+                {
+                    { "Exception", output.Error }
+                },
+                "TryQueryGVFSConfig failed");
 
             return false;
         }

GVFS/GVFS.Common/Http/HttpRequestor.cs

@@ -23,7 +23,6 @@ public abstract class HttpRequestor : IDisposable
 
         private readonly ProductInfoHeaderValue userAgentHeader;
 
-        private HttpClient client;
         private readonly GitAuthentication authentication;
 
         private readonly Lazy<X509Store> store = new Lazy<X509Store>(() =>
@@ -33,6 +32,8 @@ public abstract class HttpRequestor : IDisposable
             return s;
         });
 
+        private HttpClient client;
+
         static HttpRequestor()
         {
             ServicePointManager.SecurityProtocol = ServicePointManager.SecurityProtocol | SecurityProtocolType.Tls12;
@@ -63,9 +64,10 @@ protected HttpRequestor(ITracer tracer, RetryConfig retryConfig, Enlistment enli
                 string certificatePassword = null;
                 if (enlistment.GitSslSettings.SslCertPasswordProtected)
                 {
-                    certificatePassword = LoadCertificatePassword(enlistment.GitSslSettings.SslCertificate, enlistment.CreateGitProcess());
+                    certificatePassword = this.LoadCertificatePassword(enlistment.GitSslSettings.SslCertificate, enlistment.CreateGitProcess());
                 }
-                var cert = LoadCertificate(enlistment.GitSslSettings.SslCertificate, certificatePassword);
+
+                var cert = this.LoadCertificate(enlistment.GitSslSettings.SslCertificate, certificatePassword);
                 if (cert != null)
                 {
                     httpClientHandler.ClientCertificates.Add(cert);
@@ -80,38 +82,6 @@ protected HttpRequestor(ITracer tracer, RetryConfig retryConfig, Enlistment enli
             this.userAgentHeader = new ProductInfoHeaderValue(ProcessHelper.GetEntryClassName(), ProcessHelper.GetCurrentProcessVersion());
         }
 
-        private string LoadCertificatePassword(string certId, GitProcess git)
-        {
-            if (git.TryGetCertificatePassword(this.Tracer, certId, out var password, out var error))
-            {
-                return password;
-            }
-
-            return null;
-        }
-
-        private X509Certificate2 LoadCertificate(string certId, string certificatePassword)
-        {
-            if (File.Exists(certId))
-            {
-                return new X509Certificate2(certId, certificatePassword);
-            }
-#if DEBUG
-            // Allow invalid (self-signed) client certificates while debugging
-            var onlyValidCertificates = false;
-#else
-            var onlyValidCertificates = true;
-#endif
-            var findResults = store.Value.Certificates.Find(X509FindType.FindBySubjectName, certId, onlyValidCertificates);
-            if (findResults?.Count > 0)
-            {
-                return findResults[0];
-            }
-
-            this.Tracer.RelatedError("Certificate {0} not found", certId);
-            return null;
-        }
-
         public RetryConfig RetryConfig { get; }
 
         protected ITracer Tracer { get; }
@@ -129,9 +99,9 @@ public void Dispose()
                 this.client = null;
             }
 
-            if (store.IsValueCreated)
+            if (this.store.IsValueCreated)
             {
-                store.Value.Close();
+                this.store.Value.Close();
             }
         }
 
@@ -157,6 +127,7 @@ protected GitEndPointResponseData SendRequest(
             }
 
             HttpRequestMessage request = new HttpRequestMessage(httpMethod, requestUri);
+
             // By default, VSTS auth failures result in redirects to SPS to reauthenticate.
             // To provide more consistent behavior when using the GCM, have them send us 401s instead
             request.Headers.Add("X-TFS-FedAuthRedirect", "Suppress");
@@ -311,8 +282,8 @@ protected GitEndPointResponseData SendRequest(
             }
 
             return gitEndPointResponseData;
-        }
-
+        }
+
         private static bool ShouldRetry(HttpStatusCode statusCode)
         {
             // Retry timeout, Unauthorized, and 5xx errors
@@ -337,5 +308,37 @@ private static string GetSingleHeaderOrEmpty(HttpHeaders headers, string headerN
 
             return string.Empty;
         }
+
+        private string LoadCertificatePassword(string certId, GitProcess git)
+        {
+            if (git.TryGetCertificatePassword(this.Tracer, certId, out var password, out var error))
+            {
+                return password;
+            }
+
+            return null;
+        }
+
+        private X509Certificate2 LoadCertificate(string certId, string certificatePassword)
+        {
+            if (File.Exists(certId))
+            {
+                return new X509Certificate2(certId, certificatePassword);
+            }
+#if DEBUG
+            // Allow invalid (self-signed) client certificates while debugging
+            var onlyValidCertificates = false;
+#else
+            var onlyValidCertificates = true;
+#endif
+            var findResults = this.store.Value.Certificates.Find(X509FindType.FindBySubjectName, certId, onlyValidCertificates);
+            if (findResults?.Count > 0)
+            {
+                return findResults[0];
+            }
+
+            this.Tracer.RelatedError("Certificate {0} not found", certId);
+            return null;
+        }
     }
 }