Merge branch 'master' into features/inline-comment-edit-and-delete

Author: StanleyGoldman

src/GitHub.App/Services/TeamExplorerContext.cs

@@ -78,7 +78,7 @@ async void Refresh()
                     var newBranchName = repo?.CurrentBranch?.Name;
                     var newHeadSha = repo?.CurrentBranch?.Sha;
                     var newTrackedSha = repo?.CurrentBranch?.TrackedSha;
-                    var newPullRequest = await pullRequestService.GetPullRequestForCurrentBranch(repo);
+                    var newPullRequest = repo != null ? await pullRequestService.GetPullRequestForCurrentBranch(repo) : null;
 
                     if (newRepositoryPath != repositoryPath)
                     {

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

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
@@ -328,7 +329,7 @@ public async Task InitializeAsync(
                 LocalRepository = localRepository;
                 RemoteRepositoryOwner = owner;
                 Number = number;
-                WebUrl = LocalRepository.CloneUrl.ToRepositoryUrl().Append("pull/" + number);
+                WebUrl = localRepository.CloneUrl.ToRepositoryUrl(owner).Append("pull/" + number);
                 modelService = await modelServiceFactory.CreateAsync(connection);
 
                 await Refresh();

src/GitHub.UI/Controls/ScrollingVerticalStackPanel.cs

@@ -179,7 +179,25 @@ protected override Size ArrangeOverride(Size finalSize)
             {
                 var isFixed = GetIsFixed(child);
                 var x = isFixed ? 0 : -HorizontalOffset;
-                var childRect = new Rect(x, y, child.DesiredSize.Width, child.DesiredSize.Height);
+                var width = child.DesiredSize.Width;
+
+                if (isFixed)
+                {
+                    switch (child.HorizontalAlignment)
+                    {
+                        case HorizontalAlignment.Stretch:
+                            width = finalSize.Width;
+                            break;
+                        case HorizontalAlignment.Right:
+                            x = finalSize.Width - child.DesiredSize.Width;
+                            break;
+                        case HorizontalAlignment.Center:
+                            x = (finalSize.Width - child.DesiredSize.Width) / 2;
+                            break;
+                    }
+                }
+
+                var childRect = new Rect(x, y, width, child.DesiredSize.Height);
                 child.Arrange(childRect);
                 y += child.DesiredSize.Height;
 

src/GitHub.VisualStudio/Properties/AssemblyInfo.cs

@@ -2,36 +2,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Markup;
-using Microsoft.VisualStudio.Shell;
 
 [assembly: AssemblyTitle("GitHub.VisualStudio")]
 [assembly: AssemblyDescription("GitHub for Visual Studio VSPackage")]
 [assembly: Guid("fad77eaa-3fe1-4c4b-88dc-3753b6263cd7")]
 
-[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.UI", CodeBase = @"$PackageFolder$\GitHub.UI.dll",
-    OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
-[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.VisualStudio.UI", CodeBase = @"$PackageFolder$\GitHub.VisualStudio.UI.dll",
-    OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
-[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.Exports", CodeBase = @"$PackageFolder$\GitHub.Exports.dll",
-    OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
-[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.Extensions", CodeBase = @"$PackageFolder$\GitHub.Extensions.dll",
-    OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
-[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.Logging", CodeBase = @"$PackageFolder$\GitHub.Logging.dll",
-    OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
-
-[assembly: ProvideCodeBase(AssemblyName = "Octokit", CodeBase = @"$PackageFolder$\Octokit.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Octokit.GraphQL", CodeBase = @"$PackageFolder$\Octokit.GraphQL.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Octokit.GraphQL.Core", CodeBase = @"$PackageFolder$\Octokit.GraphQL.Core.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "LibGit2Sharp", CodeBase = @"$PackageFolder$\LibGit2Sharp.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Splat", CodeBase = @"$PackageFolder$\Splat.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Rothko", CodeBase = @"$PackageFolder$\Rothko.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Serilog", CodeBase = @"$PackageFolder$\Serilog.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Serilog.Enrichers.Thread", CodeBase = @"$PackageFolder$\Serilog.Enrichers.Thread.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.File", CodeBase = @"$PackageFolder$\Serilog.Sinks.File.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Markdig", CodeBase = @"$PackageFolder$\Markdig.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Markdig.Wpf", CodeBase = @"$PackageFolder$\Markdig.Wpf.dll")]
-[assembly: ProvideCodeBase(AssemblyName = "Newtonsoft.Json", CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
-
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.Dialog")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.GitHubPane")]

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml.cs

@@ -41,15 +41,7 @@ public PullRequestDetailView()
         void DoOpenOnGitHub()
         {
             var browser = VisualStudioBrowser;
-            var cloneUrl = ViewModel.LocalRepository.CloneUrl;
-            var url = ToPullRequestUrl(cloneUrl.Host, ViewModel.RemoteRepositoryOwner, ViewModel.LocalRepository.Name, ViewModel.Model.Number);
-            browser.OpenUrl(url);
-        }
-
-        static Uri ToPullRequestUrl(string host, string owner, string repositoryName, int number)
-        {
-            var url = string.Format(CultureInfo.InvariantCulture, "https://{0}/{1}/{2}/pull/{3}", host, owner, repositoryName, number);
-            return new Uri(url);
+            browser.OpenUrl(ViewModel.WebUrl);
         }
 
         void OpenHyperlink(object sender, ExecutedRoutedEventArgs e)