Merge branch 'master' into donokuda/tall-orgs

Author: Meaghan Lewis

Directory.Build.Props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Product>GitHub Extension for Visual Studio</Product>
-    <Version>2.6.1.0</Version>
+    <Version>2.7.0.0</Version>
     <Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>

README.md

@@ -92,6 +92,22 @@ Logs can be viewed at the following location:
 
 `%LOCALAPPDATA%\GitHubVisualStudio\extension.log`
 
+## Troubleshooting
+
+If you have issues building with failures similar to:
+
+> "The type or namespace name does not exist..."
+
+or
+
+> "Unable to find project... Check that the project reference is valid and that the project file exists."*
+
+Close Visual Studio and run the following command to update submodules and clean your environment.
+
+```txt
+clean.cmd
+```
+
 ## More information
 - Andreia Gaita's [presentation](https://www.youtube.com/watch?v=hz2hCO8e_8w) at Codemania 2016 about this extension.
 
@@ -104,4 +120,3 @@ Visit the [Contributor Guidelines](CONTRIBUTING.md) for details on how to contri
 Copyright 2015 - 2018 GitHub, Inc.
 
 Licensed under the [MIT License](LICENSE.md)
-

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.6.1.{build}'
+version: '2.7.0.{build}'
 skip_tags: true
 install:
 - ps: |

clean.cmd

@@ -0,0 +1,3 @@
+git submodule update --init
+git clean -xdff
+git submodule foreach git clean -xdff

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);
         }

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -232,12 +232,12 @@ await pullRequestService.ExtractToTempFile(
 
                 var leftText = diffViewer.LeftView.TextBuffer.CurrentSnapshot.GetText();
                 var rightText = diffViewer.RightView.TextBuffer.CurrentSnapshot.GetText();
-                if (leftText == string.Empty)
+                if (leftText.Length == 0)
                 {
                     // Don't show LeftView when empty.
                     diffViewer.ViewMode = DifferenceViewMode.RightViewOnly;
                 }
-                else if (rightText == string.Empty)
+                else if (rightText.Length == 0)
                 {
                     // Don't show RightView when empty.
                     diffViewer.ViewMode = DifferenceViewMode.LeftViewOnly;
@@ -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/GitHubPaneViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Design;
+using System.Globalization;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
@@ -253,29 +254,29 @@ public async Task NavigateTo(Uri uri)
             {
                 var owner = match.Groups["owner"].Value;
                 var repo = match.Groups["repo"].Value;
-                var number = int.Parse(match.Groups["number"].Value);
+                var number = int.Parse(match.Groups["number"].Value, CultureInfo.InvariantCulture);
                 await ShowPullRequest(owner, repo, number);
             }
             else if ((match = pullNewReviewUri.Match(uri.AbsolutePath))?.Success == true)
             {
                 var owner = match.Groups["owner"].Value;
                 var repo = match.Groups["repo"].Value;
-                var number = int.Parse(match.Groups["number"].Value);
+                var number = int.Parse(match.Groups["number"].Value, CultureInfo.InvariantCulture);
                 await ShowPullRequestReviewAuthoring(owner, repo, number);
             }
             else if ((match = pullUserReviewsUri.Match(uri.AbsolutePath))?.Success == true)
             {
                 var owner = match.Groups["owner"].Value;
                 var repo = match.Groups["repo"].Value;
-                var number = int.Parse(match.Groups["number"].Value);
+                var number = int.Parse(match.Groups["number"].Value, CultureInfo.InvariantCulture);
                 var login = match.Groups["login"].Value;
                 await ShowPullRequestReviews(owner, repo, number, login);
             }
             else if ((match = pullCheckRunsUri.Match(uri.AbsolutePath))?.Success == true)
             {
                 var owner = match.Groups["owner"].Value;
                 var repo = match.Groups["repo"].Value;
-                var number = int.Parse(match.Groups["number"].Value);
+                var number = int.Parse(match.Groups["number"].Value, CultureInfo.InvariantCulture);
                 var id = match.Groups["id"].Value;
 
                 await ShowPullRequestCheckRun(owner, repo, number, id);

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reactive;
@@ -252,7 +253,7 @@ void FilterChanged()
 
                 if (numberFilter == 0)
                 {
-                    stringFilter = SearchQuery.ToUpper();
+                    stringFilter = SearchQuery.ToUpperInvariant();
                 }
             }
             else
@@ -280,7 +281,7 @@ bool FilterItem(object o)
                     }
                     else
                     {
-                        result = item.Title.ToUpper().Contains(stringFilter);
+                        result = item.Title.ToUpperInvariant().Contains(stringFilter);
                     }
                 }
             }

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>

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

@@ -131,7 +131,7 @@ public PullRequestDetailViewModel(
             SubscribeOperationError(SyncSubmodules);
 
             OpenOnGitHub = ReactiveCommand.Create(DoOpenDetailsUrl);
-        
+
             ShowReview = ReactiveCommand.Create<IPullRequestReviewSummaryViewModel>(DoShowReview);
 
             ShowAnnotations = ReactiveCommand.Create<IPullRequestCheckViewModel>(DoShowAnnotations);
@@ -350,7 +350,7 @@ public async Task Load(PullRequestDetailModel pullRequest)
                 Body = !string.IsNullOrWhiteSpace(pullRequest.Body) ? pullRequest.Body : Resources.NoDescriptionProvidedMarkdown;
                 Reviews = PullRequestReviewSummaryViewModel.BuildByUser(Session.User, pullRequest).ToList();
 
-                Checks = (IReadOnlyList<IPullRequestCheckViewModel>) PullRequestCheckViewModel.Build(viewViewModelFactory, pullRequest)?.ToList() ?? Array.Empty<IPullRequestCheckViewModel>();
+                Checks = (IReadOnlyList<IPullRequestCheckViewModel>)PullRequestCheckViewModel.Build(viewViewModelFactory, pullRequest)?.ToList() ?? Array.Empty<IPullRequestCheckViewModel>();
 
                 await Files.InitializeAsync(Session);
 
@@ -370,6 +370,7 @@ public async Task Load(PullRequestDetailModel pullRequest)
                     if (pullEnabled)
                     {
                         pullToolTip = string.Format(
+                            CultureInfo.InvariantCulture,
                             Resources.PullRequestDetailsPullToolTip,
                             IsFromFork ? Resources.Fork : Resources.Remote,
                             SourceBranchDisplayName);
@@ -382,6 +383,7 @@ public async Task Load(PullRequestDetailModel pullRequest)
                     if (pushEnabled)
                     {
                         pushToolTip = string.Format(
+                            CultureInfo.InvariantCulture,
                             Resources.PullRequestDetailsPushToolTip,
                             IsFromFork ? Resources.Fork : Resources.Remote,
                             SourceBranchDisplayName);
@@ -396,16 +398,22 @@ public async Task Load(PullRequestDetailModel pullRequest)
                     }
 
                     var submodulesToSync = await pullRequestsService.CountSubmodulesToSync(LocalRepository);
-                    var syncSubmodulesToolTip = string.Format(Resources.SyncSubmodules, submodulesToSync);
+                    var syncSubmodulesToolTip = string.Format(CultureInfo.InvariantCulture, Resources.SyncSubmodules, submodulesToSync);
 
                     UpdateState = new UpdateCommandState(divergence, pullEnabled, pushEnabled, pullToolTip, pushToolTip, syncSubmodulesToolTip, submodulesToSync);
                     CheckoutState = null;
                 }
                 else
                 {
                     var caption = localBranches.Count > 0 ?
-                        string.Format(Resources.PullRequestDetailsCheckout, localBranches.First().DisplayName) :
-                        string.Format(Resources.PullRequestDetailsCheckoutTo, await pullRequestsService.GetDefaultLocalBranchName(LocalRepository, Model.Number, Model.Title));
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            Resources.PullRequestDetailsCheckout,
+                            localBranches.First().DisplayName) :
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            Resources.PullRequestDetailsCheckoutTo,
+                            await pullRequestsService.GetDefaultLocalBranchName(LocalRepository, Model.Number, Model.Title));
                     var clean = await pullRequestsService.IsWorkingDirectoryClean(LocalRepository);
                     string disabled = null;
 

src/GitHub.App/ViewModels/UserFilterViewModel.cs

@@ -146,7 +146,10 @@ public int Compare(object x, object y)
             {
                 if (x == owner.ersatzUser) return -1;
                 if (y == owner.ersatzUser) return 1;
-                return ((IActorViewModel)x).Login.CompareTo(((IActorViewModel)y).Login);
+                return string.Compare(
+                    ((IActorViewModel)x).Login,
+                    ((IActorViewModel)y).Login,
+                    StringComparison.Ordinal);
             }
         }
     }