Merge branch 'master' into update-graphql-submodule

Author: StanleyGoldman

src/CredentialManagement/NativeMethods.cs

@@ -4,6 +4,10 @@
 using System.Text;
 using Microsoft.Win32.SafeHandles;
 
+#pragma warning disable CA1034 // Nested types should not be visible
+#pragma warning disable CA1051 // Do not declare visible instance fields
+#pragma warning disable CA1707 // Identifiers should not contain underscores
+
 namespace GitHub.Authentication.CredentialManagement
 {
     public static class NativeMethods

src/GitHub.Api/GlobalSuppressions.cs

@@ -0,0 +1,9 @@
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task", Justification = "Discouraged for VSSDK projects.")]
+

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/Collections/VirtualizingList.cs

@@ -12,6 +12,10 @@
 using GitHub.Logging;
 using Serilog;
 
+#pragma warning disable CA1010 // Collections should implement generic interface
+#pragma warning disable CA1033 // Interface methods should be callable by child types
+#pragma warning disable CA1710 // Identifiers should have correct suffix
+
 namespace GitHub.Collections
 {
     /// <summary>

src/GitHub.App/Collections/VirtualizingListCollectionView.cs

@@ -4,6 +4,10 @@
 using System.Collections.Specialized;
 using System.Windows.Data;
 
+#pragma warning disable CA1010 // Collections should implement generic interface
+#pragma warning disable CA1033 // Interface methods should be callable by child types
+#pragma warning disable CA1710 // Identifiers should have correct suffix
+
 namespace GitHub.Collections
 {
     /// <summary>

src/GitHub.App/GlobalSuppressions.cs

@@ -1,12 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "GitHub.ViewModels.CreateRepoViewModel.#ResetState()")]
-[assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.Resources.resources")]
-[assembly: SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Scope = "member", Target = "GitHub.Caches.CredentialCache.#InsertObject`1(System.String,!!0,System.Nullable`1<System.DateTimeOffset>)")]
-[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)")]
-
 // This file is used by Code Analysis to maintain SuppressMessage 
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given 
@@ -16,3 +7,15 @@
 // Code Analysis results, point to "Suppress Message", and click 
 // "In Suppression File".
 // You do not need to add suppressions to this file manually.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "GitHub.ViewModels.CreateRepoViewModel.#ResetState()")]
+[assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.Resources.resources")]
+[assembly: SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Scope = "member", Target = "GitHub.Caches.CredentialCache.#InsertObject`1(System.String,!!0,System.Nullable`1<System.DateTimeOffset>)")]
+[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("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/ErrorMessageTranslator.cs

@@ -7,6 +7,7 @@
 using ReactiveUI.Legacy;
 
 #pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable CA1034 // Nested types should not be visible
 
 namespace GitHub.Services
 {

src/GitHub.App/Services/ModelService.cs

@@ -22,6 +22,8 @@
 using Serilog;
 using static Octokit.GraphQL.Variable;
 
+#pragma warning disable CA1034 // Nested types should not be visible
+
 namespace GitHub.Services
 {
     [Export(typeof(IModelService))]
@@ -365,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);
         }