Merge branch 'master' into packaging-release-branches

Author: StanleyGoldman

.github/ISSUE_TEMPLATE/localization_suggestion.md

@@ -0,0 +1,45 @@
+---
+name: Localization suggestion
+about: Suggest an improvement to our localization
+labels: localization, bug
+title: 'Localization: '
+---
+<!-- Hello! Please read the [Contributing Guidelines](https://github.com/github/VisualStudio/blob/master/CONTRIBUTING.md) before submitting an issue regarding the GitHub Extension for Visual Studio. -->
+## Language
+<!-- Czech -->
+<!-- German -->
+<!-- Spanish -->
+<!-- French -->
+<!-- Italian -->
+<!-- Japanese -->
+<!-- Korean -->
+<!-- Polish -->
+<!-- Portuguese (Brazil) -->
+<!-- Russian -->
+<!-- Turkish -->
+<!-- Chinese (Simplified) -->
+<!-- Chinese (Traditional) -->
+
+## English source
+<!-- Translations are made from the English sources, please paste it here. -->
+```
+
+```
+
+## Original Translation
+<!-- Please paste the original translation here. -->
+```
+
+```
+
+## Screenshots
+<!-- Translations are sometimes provided by vendors that do not have access to the UI. Providing screenshots can give them a lot of context. -->
+
+## Notes
+<!-- If you can, please explain what is incorrect about the translation. -->
+
+## Suggested Translation
+<!-- If you can, please suggest an alternate translation. -->
+```
+
+```

Directory.Build.Props

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

GitHubVS.sln

@@ -1,8 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28603.18
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.Vsix", "src\GitHub.VisualStudio.Vsix\GitHub.VisualStudio.Vsix.csproj", "{D26B4B40-0C94-48AD-8019-0B9BE46E0071}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7F5ED78B-74A3-4406-A299-70CFB5885B8B} = {7F5ED78B-74A3-4406-A299-70CFB5885B8B}
@@ -33,7 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F
 	ProjectSection(SolutionItems) = preProject
 		scripts\Modules\BuildUtils.psm1 = scripts\Modules\BuildUtils.psm1
 		scripts\Modules\Debugging.psm1 = scripts\Modules\Debugging.psm1
-		scripts\Modules\Vsix.psm1 = scripts\Modules\Vsix.psm1
+		scripts\modules\Versioning.ps1 = scripts\modules\Versioning.ps1
+		scripts\modules\Vsix.ps1 = scripts\modules\Vsix.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C5F8D-14B3-443D-B044-0E209AE12BDF}"
@@ -141,7 +144,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.GraphQL.Core", "sub
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.GraphQL", "submodules\octokit.graphql.net\Octokit.GraphQL\Octokit.GraphQL.csproj", "{791B408C-0ABC-465B-9EB1-A2422D67F418}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage.UnitTests", "test\GitHub.StartPage.UnitTests\GitHub.StartPage.UnitTests.csproj", "{B467682B-9F0E-42D8-8A20-1DE78F798793}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.StartPage.UnitTests", "test\GitHub.StartPage.UnitTests\GitHub.StartPage.UnitTests.csproj", "{B467682B-9F0E-42D8-8A20-1DE78F798793}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -151,6 +154,14 @@ Global
 		ReleaseWithoutVsix|Any CPU = ReleaseWithoutVsix|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugWithoutVsix|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.DebugWithoutVsix|Any CPU.Build.0 = DebugWithoutVsix|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.ReleaseWithoutVsix|Any CPU.ActiveCfg = ReleaseWithoutVsix|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.ReleaseWithoutVsix|Any CPU.Build.0 = ReleaseWithoutVsix|Any CPU
 		{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugWithoutVsix|Any CPU

README.md

@@ -19,7 +19,6 @@ Official builds of this extension are available at [the official website](https:
 
 [![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)
 [![Build Status](https://github-editor-tools.visualstudio.com/VisualStudio/_apis/build/status/github.VisualStudio?branchName=master)](https://github-editor-tools.visualstudio.com/VisualStudio/_build/latest?definitionId=4&branchName=master)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/github-visual-studio/localized.svg)](https://crowdin.com/project/github-visual-studio)
 [![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)
 
 [![Follow GitHub for Visual Studio](https://img.shields.io/twitter/follow/GitHubVS.svg?style=social "Follow GitHubVS")](https://twitter.com/githubvs?ref_src=twsrc%5Etfw) [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.8.0.{build}'
+version: '2.9.0.{build}'
 skip_tags: true
 
 install:

crowdin.yml

@@ -2,7 +2,7 @@
 
 After you provide your GitHub or GitHub Enterprise credentials to GitHub for Visual Studio, the extension automatically detects the personal, collaborator and organization repositories you have access to on your account.
 
-## Opening the clone dialog 
+## Opening the clone dialog
 
 ### From **Team Explorer**
 
@@ -17,7 +17,12 @@ Next to the account you want to clone from, click **Clone**.
 
 ### From the **Start Page**
 
-Using Visual Studio 2017, click the `GitHub` button on the `Start Page` to open the clone dialog. 
+Using Visual Studio 2017, click the `GitHub` button on the `Start Page` to open the clone dialog.
+
+
+### From the **Start Window**
+
+Using Visual Studio 2019, on the `Start Window` select `Clone or check out code` and then click the `GitHub` button to open the clone dialog.
 
 
 ### From the **File** menu
@@ -26,14 +31,19 @@ Go to `File > Open > Open From GitHub...`
 
 
 ## Clone repositories
-1. In the list of repositories, scroll until you find the repository you'd like to clone. You can also filter the repository results by using the *Filter* text box.
+1. In the list of repositories, scroll until you find the repository you'd like to clone.
 
-![List of GitHub repositories that can be cloned inside a dialog](images/clone-dialog.png)
+You can also filter the repository results by using the *Filter* text box.
 
-In addition to using the list of personal, collaborator and organization repositories, you can use the URL tab to clone a public repository by its URL or using the repository owner and name.
+In addition to using the list of personal, collaborator and organization repositories, you can enter a repository URL to clone a public repository.
 
-![List of GitHub repositories that can be cloned inside a dialog](images/clone-url-dialog.png)
+![Unified clone and open dialog](images/unified-clone-dialog.png)
 
 2. If desired, change the local path that the repository will be cloned into, or leave the default as-is.
 3. Once a repository is selected and the path is set, Click **Clone**.
 4. In Team Explorer, under the list of solutions, double-click on a solution to open it in Visual Studio.
+
+## Open repositories
+For any repository that you select from the list or provide a URL for that you already have cloned locally, the **Open** button becomes enabled and a message shows that you have already cloned the repository to that location.
+
+![Open option enabled in clone dialog](images/open-cloned-repository.png)

docs/using/cloning-a-repository-to-visual-studio.md

@@ -15,13 +15,19 @@ GitHub for Visual Studio provides facilities for reviewing a pull request direct
 The Pull Request Details view shows the current state of the pull request, including:
 - information about who created the pull request
 - the source and target branch
-- a description of the pull request
+- a description of the pull request (collapsed by default)
 - reviewers and the status of their review
 - checks (if checks have been enabled for the repository)
 - the files changed
 
 ![The details of a single pull request in the GitHub pane](images/pr-detail-view.png)
 
+## Viewing conversation details
+
+Click the comment count link in the GitHub pane to open up the conversation view. The conversation view shows the Pull Request description, a history of commits, and comments made.
+
+![View the conversation for a pull request](images/view-conversation.png)
+
 ## Checking out a pull request
 
 To check out the pull request branch, click the **Checkout [branch]** link where [branch] is the name of the branch that will be checked out.

docs/using/images/clone-dialog.png

@@ -1,5 +1,5 @@
 {
-    "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "1.6.52"
-    }
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "1.6.61"
+  }
 }

docs/using/images/clone-url-dialog.png

@@ -1,7 +1,7 @@
 Set-StrictMode -Version Latest
 
 New-Module -ScriptBlock {
-    $gitHubDirectory = Join-Path $rootDirectory src\GitHub.VisualStudio
+    $gitHubDirectory = Join-Path $rootDirectory src\GitHub.VisualStudio.Vsix
 
     function Get-VsixManifestPath {
         Join-Path $gitHubDirectory source.extension.vsixmanifest

docs/using/images/open-cloned-repository.png

@@ -59,13 +59,13 @@ Depends on #1993
                 new CommitListViewModel(
                     new CommitSummaryViewModel(new CommitModel
                     {
-                        Author = new ActorModel { Login = "grokys" },
+                        Author = new CommitActorModel { User = new ActorModel{ Login = "grokys" }},
                         AbbreviatedOid = "c7c7d25",
                         MessageHeadline = "Refactor comment view models."
                     }),
                     new CommitSummaryViewModel(new CommitModel
                     {
-                        Author = new ActorModel { Login = "shana" },
+                        Author = new CommitActorModel { User = new ActorModel{ Login = "shana" }},
                         AbbreviatedOid = "04e6a90",
                         MessageHeadline = "Refactor comment view models.",
                     })),

docs/using/images/unified-clone-dialog.png

@@ -224,6 +224,7 @@ public async Task CloneRepository(
             catch (Exception ex)
             {
                 log.Error(ex, "Could not clone {CloneUrl} to {Path}", cloneUrl, repositoryPath);
+                operatingSystem.Directory.DeleteDirectory(repositoryPath);
                 throw;
             }
         }

docs/using/images/view-conversation.png

@@ -0,0 +1,19 @@
+using GitHub.Models;
+
+namespace GitHub.ViewModels
+{
+    public class CommitActorViewModel: ActorViewModel, ICommitActorViewModel
+    {
+        public CommitActorViewModel(CommitActorModel model)
+            :base(model.User)
+        {
+            Name = model.Name;
+            Email = model.Email;
+            HasLogin = model.User != null;
+        }
+
+        public string Email { get; }
+        public string Name { get; }
+        public bool HasLogin { get; }
+    }
+}

docs/using/reviewing-a-pull-request-in-visual-studio.md

@@ -25,6 +25,7 @@ public CommitListViewModel(params ICommitSummaryViewModel[] commits)
 
             Commits = commits;
             Author = Commits[0].Author;
+            AuthorName = GetAuthorDisplayName(Commits[0].Author);
             AuthorCaption = BuildAuthorCaption();
         }
 
@@ -42,12 +43,16 @@ public CommitListViewModel(IEnumerable<ICommitSummaryViewModel> commits)
             }
 
             Author = Commits[0].Author;
+            AuthorName = GetAuthorDisplayName(Commits[0].Author);
             AuthorCaption = BuildAuthorCaption();
         }
 
         /// <inheritdoc/>
-        public IActorViewModel Author { get; }
+        public ICommitActorViewModel Author { get; }
 
+        /// <inheritdoc/>
+        public string AuthorName { get; }
+       
         /// <inheritdoc/>
         public string AuthorCaption { get; }
 
@@ -58,7 +63,7 @@ string BuildAuthorCaption()
         {
             var result = new StringBuilder();
 
-            if (Commits.Any(x => x.Author.Login != Author.Login))
+            if (Commits.Any(x => GetAuthorDisplayName(x.Author) != AuthorName))
             {
                 result.Append(Resources.AndOthers);
                 result.Append(' ');
@@ -67,5 +72,10 @@ string BuildAuthorCaption()
             result.Append(Resources.AddedSomeCommits);
             return result.ToString();
         }
+
+        string GetAuthorDisplayName(ICommitActorViewModel commitActorViewModel)
+        {
+            return commitActorViewModel.HasLogin ? commitActorViewModel.Login : commitActorViewModel.Name;
+        }
     }
 }

global.json

@@ -14,7 +14,7 @@ public class CommitSummaryViewModel : ViewModelBase, ICommitSummaryViewModel
         public CommitSummaryViewModel(CommitModel commit)
         {
             AbbreviatedOid = commit.AbbreviatedOid;
-            Author = new ActorViewModel(commit.Author);
+            Author = new CommitActorViewModel(commit.Author);
             Header = commit.MessageHeadline;
             Oid = commit.Oid;
         }
@@ -23,7 +23,7 @@ public CommitSummaryViewModel(CommitModel commit)
         public string AbbreviatedOid { get; private set; }
 
         /// <inheritdoc/>
-        public IActorViewModel Author { get; private set; }
+        public ICommitActorViewModel Author { get; private set; }
 
         /// <inheritdoc/>
         public string Header { get; private set; }

scripts/modules/Vsix.ps1

@@ -3,9 +3,11 @@
 using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Extensions;
+using GitHub.Logging;
 using GitHub.Models;
 using GitHub.Services;
 using ReactiveUI;
+using Serilog;
 
 namespace GitHub.ViewModels.GitHubPane
 {
@@ -14,6 +16,8 @@ namespace GitHub.ViewModels.GitHubPane
     /// </summary>
     public class PullRequestReviewCommentViewModel : IPullRequestReviewFileCommentViewModel
     {
+        static readonly ILogger log = LogManager.ForContext<PullRequestReviewCommentViewModel>();
+
         readonly IPullRequestEditorService editorService;
         readonly IPullRequestSession session;
         readonly PullRequestReviewCommentModel model;
@@ -52,18 +56,34 @@ async Task DoOpen()
             {
                 if (thread == null)
                 {
-                    var file = await session.GetFile(RelativePath, model.Thread.CommitSha);
-                    thread = file.InlineCommentThreads.FirstOrDefault(t => t.Comments.Any(c => c.Comment.Id == model.Id));
+                    if(model.Thread.IsOutdated)
+                    {
+                        var file = await session.GetFile(RelativePath, model.Thread.OriginalCommitSha);
+                        thread = file.InlineCommentThreads.FirstOrDefault(t => t.Comments.Any(c => c.Comment.Id == model.Id));
+                    }
+                    else
+                    {
+                        var file = await session.GetFile(RelativePath, model.Thread.CommitSha);
+                        thread = file.InlineCommentThreads.FirstOrDefault(t => t.Comments.Any(c => c.Comment.Id == model.Id));
+
+                        if(thread?.LineNumber == -1)
+                        {
+                            log.Warning("Couldn't find line number for comment on {RelativePath} @ {CommitSha}", RelativePath, model.Thread.CommitSha);
+                            // Fall back to opening outdated file if we can't find a line number for the comment
+                            file = await session.GetFile(RelativePath, model.Thread.OriginalCommitSha);
+                            thread = file.InlineCommentThreads.FirstOrDefault(t => t.Comments.Any(c => c.Comment.Id == model.Id));
+                        }
+                    }
                 }
 
                 if (thread != null && thread.LineNumber != -1)
                 {
                     await editorService.OpenDiff(session, RelativePath, thread);
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                // TODO: Show error.
+                log.Error(e, nameof(DoOpen));
             }
         }
     }