Merge branch 'master' into bump-version

Author: Meaghan Lewis

docs/developer/how-viewmodels-are-turned-into-views.md

@@ -65,8 +65,8 @@ This is the basis for converting view models to views.
 
 There are currently two top-level controls for our UI:
 
-- [GitHubDialogWindow](../src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml) for the dialog which shows the login, clone, etc views
-- [GitHubPaneView](../src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml) for the GitHub pane
+- [GitHubDialogWindow](../../src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml) for the dialog which shows the login, clone, etc views
+- [GitHubPaneView](../../src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml) for the GitHub pane
 
 In the resources for each of these top-level controls we define a `DataTemplate` like so:
 
@@ -77,10 +77,10 @@ In the resources for each of these top-level controls we define a `DataTemplate`
 </DataTemplate>
 ```
 
-The `DataTemplate.DataType` here applies the template to all classes inherited from [`GitHub.ViewModels.ViewModelBase`](../src/GitHub.Exports.Reactive/ViewModels/ViewModelBase.cs) [1]. The template defines a single `ContentControl` whose contents are created by a `ViewLocator`.
+The `DataTemplate.DataType` here applies the template to all classes inherited from [`GitHub.ViewModels.ViewModelBase`](../../src/GitHub.Exports.Reactive/ViewModels/ViewModelBase.cs) [1]. The template defines a single `ContentControl` whose contents are created by a `ViewLocator`.
 
-The [`ViewLocator`](../src/GitHub.VisualStudio/Views/ViewLocator.cs) class is an `IValueConverter` which then creates an instance of the appropriate view for the view model using MEF.
+The [`ViewLocator`](../../src/GitHub.VisualStudio/Views/ViewLocator.cs) class is an `IValueConverter` which then creates an instance of the appropriate view for the view model using MEF.
 
 And thus a view model becomes a view.
 
-[1]: it would be nice to make it apply to all classes that inherit `IViewModel` but unfortunately WPF's `DataTemplate`s don't work with interfaces.
+[1]: it would be nice to make it apply to all classes that inherit `IViewModel` but unfortunately WPF's `DataTemplate`s don't work with interfaces.

src/GitHub.Exports/GitHub.Exports.csproj

@@ -197,6 +197,7 @@
     <Compile Include="Services\IUsageService.cs" />
     <Compile Include="Settings\PkgCmdID.cs" />
     <Compile Include="ViewModels\GitHubPane\IGitHubPaneViewModel.cs" />
+    <Compile Include="ViewModels\GitHubPane\IGitHubToolWindowManager.cs" />
     <Compile Include="ViewModels\IConnectionInitializedViewModel.cs" />
     <Compile Include="ViewModels\IInfoPanel.cs" />
     <Compile Include="ViewModels\IViewModel.cs" />

src/GitHub.Exports/ViewModels/GitHubPane/IGitHubToolWindowManager.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// The Visual Studio service interface for accessing the GitHub Pane.
+    /// </summary>
+    [Guid("FC9EC5B5-C297-4548-A229-F8E16365543C")]
+    [ComVisible(true)]
+    public interface IGitHubToolWindowManager
+    {
+        /// <summary>
+        /// Ensure that the GitHub pane is created and visible.
+        /// </summary>
+        /// <returns>The view model for the GitHub Pane.</returns>
+        Task<IGitHubPaneViewModel> ShowGitHubPane();
+    }
+}

src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs

@@ -1,10 +1,10 @@
 using System;
 using System.IO;
-using System.Windows;
 using System.Threading.Tasks;
 using System.ComponentModel.Composition;
 using GitHub.Commands;
 using GitHub.Services;
+using GitHub.ViewModels.GitHubPane;
 using GitHub.Services.Vssdk.Commands;
 using EnvDTE;
 using Microsoft.VisualStudio;

src/GitHub.VisualStudio/Commands/OpenPullRequestsCommand.cs

@@ -4,6 +4,7 @@
 using GitHub.Commands;
 using GitHub.Logging;
 using GitHub.Services;
+using GitHub.ViewModels.GitHubPane;
 using GitHub.Services.Vssdk.Commands;
 using Serilog;
 

src/GitHub.VisualStudio/Commands/ShowCurrentPullRequestCommand.cs

@@ -4,7 +4,7 @@
 using GitHub.Commands;
 using GitHub.Logging;
 using GitHub.Services;
-using GitHub.Extensions;
+using GitHub.ViewModels.GitHubPane;
 using GitHub.Services.Vssdk.Commands;
 using Serilog;
 

src/GitHub.VisualStudio/Commands/ShowGitHubPaneCommand.cs

@@ -4,6 +4,7 @@
 using GitHub.Commands;
 using GitHub.Logging;
 using GitHub.Services;
+using GitHub.ViewModels.GitHubPane;
 using GitHub.Services.Vssdk.Commands;
 using Serilog;
 

src/GitHub.VisualStudio/IServiceProviderPackage.cs

@@ -1,18 +1,8 @@
 using System;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using GitHub.ViewModels.GitHubPane;
 
 namespace GitHub.VisualStudio
 {
     public interface IServiceProviderPackage : IServiceProvider, Microsoft.VisualStudio.Shell.IAsyncServiceProvider
     {
     }
-
-    [Guid("FC9EC5B5-C297-4548-A229-F8E16365543C")]
-    [ComVisible(true)]
-    public interface IGitHubToolWindowManager
-    {
-        Task<IGitHubPaneViewModel> ShowGitHubPane();
-    }
 }

src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml

@@ -54,7 +54,7 @@
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <ui:OcticonImage Grid.Column="0" Icon="repo_forked" Background="Red" Height="16" Width="16" />
+                        <ui:OcticonImage Grid.Column="0" Icon="repo_forked" Height="16" Width="16" />
                         <TextBlock Margin="8 0 0 0" Grid.Column="1" TextWrapping="Wrap">Fork the repository</TextBlock>
                     </Grid>
 

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs

@@ -555,7 +555,7 @@ Line 2
                 }
             }
 
-            [Test]
+            [Test, Ignore("Flaky test, see https://github.com/github/VisualStudio/issues/1795")]
             public async Task AddsNewReviewCommentToThread()
             {
                 var baseContents = @"Line 1