Merge pull request #2135 from github/fixes/trivial-ca-fixes

 A bunch of trivial CA warning fixes.

Author: jcansdale

src/GitHub.Api/LoginManager.cs

@@ -289,7 +289,7 @@ async Task<ApplicationAuthorization> HandleTwoFactorAuthorization(
             }
         }
 
-        ApplicationAuthorization EnsureNonNullAuthorization(ApplicationAuthorization auth)
+        static ApplicationAuthorization EnsureNonNullAuthorization(ApplicationAuthorization auth)
         {
             // If a mock IGitHubClient is not set up correctly, it can return null from
             // IGutHubClient.Authorization.Create - this will cause an infinite loop in Login()

src/GitHub.App/Api/ApiClient.cs

@@ -18,7 +18,6 @@ namespace GitHub.Api
 {
     public partial class ApiClient : IApiClient
     {
-        const string ScopesHeader = "X-OAuth-Scopes";
         const string ProductName = Info.ApplicationInfo.ApplicationDescription;
         static readonly ILogger log = LogManager.ForContext<ApiClient>();
 

src/GitHub.App/GlobalSuppressions.cs

@@ -16,4 +16,6 @@
 [assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.App.Resources.resources")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String)")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String,System.Text.Encoding)")]
-[assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task", Justification = "Discouraged for VSSDK projects.")]
+[assembly: SuppressMessage("Design", "CA1056:Uri properties should not be strings")]
+[assembly: SuppressMessage("Design", "CA1054:Uri parameters should not be strings")]
+[assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task", Justification = "Discouraged for VSSDK projects.")]

src/GitHub.App/Services/EnterpriseCapabilitiesService.cs

@@ -55,7 +55,7 @@ public async Task<EnterpriseLoginMethods> ProbeLoginMethods(Uri enterpriseBaseUr
             }
         }
 
-        private async Task<EnterpriseMeta> GetMetadata(IConnection connection)
+        private static async Task<EnterpriseMeta> GetMetadata(IConnection connection)
         {
             var endpoint = new Uri("meta", UriKind.Relative);
             var response = await connection.Get<EnterpriseMeta>(endpoint, null, null).ConfigureAwait(false);

src/GitHub.App/Services/ModelService.cs

@@ -367,7 +367,7 @@ RemoteRepositoryModel Create(RepositoryCacheItem item)
             };
         }
 
-        GitReferenceModel Create(GitReferenceCacheItem item)
+        static GitReferenceModel Create(GitReferenceCacheItem item)
         {
             return new GitReferenceModel(item.Ref, item.Label, item.Sha, item.RepositoryCloneUrl);
         }

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -436,7 +436,7 @@ public int FindMatchingLine(IList<string> fromLines, IList<string> toLines, int
         /// <param name="line">The 0-based line we're navigating from.</param>
         /// <param name="matchedLines">The number of similar matched lines in <see cref="toLines"/></param>
         /// <returns>Find the nearest matching line in <see cref="toLines"/>.</returns>
-        public int FindNearestMatchingLine(IList<string> fromLines, IList<string> toLines, int line, out int matchedLines)
+        public static int FindNearestMatchingLine(IList<string> fromLines, IList<string> toLines, int line, out int matchedLines)
         {
             line = line < fromLines.Count ? line : fromLines.Count - 1; // VS shows one extra line at end
             var fromLine = fromLines[line];

src/GitHub.App/ViewModels/CommentThreadViewModel.cs

@@ -85,7 +85,7 @@ protected IDisposable AddPlaceholder(ICommentViewModel placeholder)
                 x => x.EditState,
                 x => x.Body,
                 (state, body) => (state, body))
-                .Subscribe(x => PlaceholderChanged(placeholder, x.state, x.body));
+                .Subscribe(x => PlaceholderChanged(placeholder, x.state));
         }
 
         /// <summary>
@@ -120,7 +120,7 @@ protected async Task DeleteDraft(ICommentViewModel comment)
 
         protected abstract (string key, string secondaryKey) GetDraftKeys(ICommentViewModel comment);
 
-        void PlaceholderChanged(ICommentViewModel placeholder, CommentEditState state, string body)
+        void PlaceholderChanged(ICommentViewModel placeholder, CommentEditState state)
         {
             if (state == CommentEditState.Editing)
             {

src/GitHub.App/ViewModels/Dialog/GitHubDialogWindowViewModel.cs

@@ -81,7 +81,7 @@ public async Task StartWithConnection<T>(T viewModel)
             }
         }
 
-        public async Task StartWithLogout<T>(T viewModel, IConnection connection)
+        public Task StartWithLogout<T>(T viewModel, IConnection connection)
             where T : IDialogContentViewModel, IConnectionInitializedViewModel
         {
             var logout = factory.CreateViewModel<ILogOutRequiredViewModel>();
@@ -101,6 +101,7 @@ public async Task StartWithLogout<T>(T viewModel, IConnection connection)
             });
 
             Content = logout;
+            return Task.CompletedTask;
         }
 
         async Task<IConnection> ShowLogin()

src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs

@@ -18,8 +18,6 @@ namespace GitHub.ViewModels.GitHubPane
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public class PullRequestCheckViewModel: ViewModelBase, IPullRequestCheckViewModel
     {
-        const string DefaultAvatar = "pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png";
-
         private readonly IUsageTracker usageTracker;
 
         /// <summary>