Merge branch 'master' into fixes/969-missing-automation-ids

Author: grokys

.ncrunch/Markdig.Wpf.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>

GitHubVS.sln

@@ -231,6 +231,7 @@ Global
 		{E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.Release|x86.ActiveCfg = Release|Any CPU
 		{E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.Release|x86.Build.0 = Release|Any CPU
 		{B1F5C227-456F-437D-BD5F-4C11B7A8D1A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1F5C227-456F-437D-BD5F-4C11B7A8D1A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1F5C227-456F-437D-BD5F-4C11B7A8D1A0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B1F5C227-456F-437D-BD5F-4C11B7A8D1A0}.Debug|x86.Build.0 = Debug|Any CPU
 		{B1F5C227-456F-437D-BD5F-4C11B7A8D1A0}.Publish|Any CPU.ActiveCfg = Release|Any CPU

GitHubVS.v3.ncrunchsolution

@@ -6,6 +6,7 @@
     </AdditionalFilesForGridProcessing>
     <AdditionalFilesToIncludeForSolution>
       <Value>lib\**.*</Value>
+      <Value>packages\Brutal.Dev.StrongNameSigner.2.1.3\build\**.*</Value>
     </AdditionalFilesToIncludeForSolution>
     <AllowParallelTestExecution>False</AllowParallelTestExecution>
     <ProjectConfigStoragePathRelativeToSolutionDir>.ncrunch</ProjectConfigStoragePathRelativeToSolutionDir>

src/GitHub.App/GitHub.App.csproj

@@ -134,6 +134,7 @@
   <ItemGroup>
     <Compile Include="Models\IssueCommentModel.cs" />
     <Compile Include="Models\PullRequestReviewCommentModel.cs" />
+    <Compile Include="Models\PullRequestDetailArgument.cs" />
     <Compile Include="ViewModels\ViewModelBase.cs" />
     <None Include="..\..\script\Key.snk" Condition="$(Buildtype) == 'Internal'">
       <Link>Key.snk</Link>

src/GitHub.App/Models/PullRequestDetailArgument.cs

@@ -0,0 +1,21 @@
+using System;
+using GitHub.ViewModels;
+
+namespace GitHub.Models
+{
+    /// <summary>
+    /// Passes arguments to a <see cref="PullRequestDetailViewModel"/>
+    /// </summary>
+    public class PullRequestDetailArgument
+    {
+        /// <summary>
+        /// Gets or sets the repository containing the pull request.
+        /// </summary>
+        public IRemoteRepositoryModel Repository { get; set; }
+
+        /// <summary>
+        /// Gets or sets the number of the pull request.
+        /// </summary>
+        public int Number { get; set; }
+    }
+}

src/GitHub.App/Models/RemoteRepositoryModel.cs

@@ -20,7 +20,8 @@ public class RemoteRepositoryModel : RepositoryModel, IRemoteRepositoryModel,
         /// <param name="isPrivate">Whether the repository is private.</param>
         /// <param name="isFork">Whether the repository is a fork.</param>
         /// <param name="ownerAccount">The repository owner account.</param>
-        public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPrivate, bool isFork, IAccount ownerAccount)
+        /// <param name="parent">The parent repository if this repository is a fork.</param>
+        public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPrivate, bool isFork,  IAccount ownerAccount, IRemoteRepositoryModel parent)
             : base(name, cloneUrl)
         {
             Guard.ArgumentNotEmptyString(name, nameof(name));
@@ -33,6 +34,7 @@ public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPr
             // this is an assumption, we'd have to load the repo information from octokit to know for sure
             // probably not worth it for this ctor
             DefaultBranch = new BranchModel("master", this);
+            Parent = parent;
         }
 
         /// <summary>

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -73,7 +73,8 @@ public PullRequestDetailViewModelDesigner()
 
         public IPullRequestModel Model { get; }
         public IPullRequestSession Session { get; }
-        public ILocalRepositoryModel Repository { get; }
+        public ILocalRepositoryModel LocalRepository { get; }
+        public IRemoteRepositoryModel RemoteRepository { get; }
         public string SourceBranchDisplayName { get; set; }
         public string TargetBranchDisplayName { get; set; }
         public int CommentCount { get; set; }

src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs

@@ -55,6 +55,9 @@ public PullRequestListViewModelDesigner()
             SelectedAuthor = Authors.ElementAt(1);
         }
 
+        public IReadOnlyList<IRemoteRepositoryModel> Repositories { get; }
+        public IRemoteRepositoryModel SelectedRepository { get; set; }
+
         public ITrackingCollection<IPullRequestModel> PullRequests { get; set; }
         public IPullRequestModel SelectedPullRequest { get; set; }
 
@@ -63,6 +66,8 @@ public PullRequestListViewModelDesigner()
 
         public ObservableCollection<IAccount> Authors { get; set; }
         public IAccount SelectedAuthor { get; set; }
+        public bool RepositoryIsFork { get; set; } = true;
+        public bool ShowPullRequestsForFork { get; set; }
 
         public ObservableCollection<IAccount> Assignees { get; set; }
         public IAccount SelectedAssignee { get; set; }

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -321,7 +321,7 @@ public static IRemoteRepositoryModel Create(string name = null, string owner = n
         {
             name = name ?? "octocat";
             owner = owner ?? "github";
-            return new RemoteRepositoryModel(0, name, new UriString("http://github.com/" + name + "/" + owner), false, false, new AccountDesigner() { Login = owner });
+            return new RemoteRepositoryModel(0, name, new UriString("http://github.com/" + name + "/" + owner), false, false, new AccountDesigner() { Login = owner }, null);
         }
     }
 

src/GitHub.App/Services/AvatarProvider.cs

@@ -1,14 +1,15 @@
 using System;
+using System.IO.Packaging;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Reactive;
 using System.Reactive.Linq;
-using System.Windows;
 using System.Windows.Media.Imaging;
 using Akavache;
 using GitHub.Caches;
 using GitHub.Extensions;
 using GitHub.Models;
+using System.Windows;
 
 namespace GitHub.Services
 {
@@ -24,13 +25,9 @@ public class AvatarProvider : IAvatarProvider
 
         static AvatarProvider()
         {
-            // NB: If this isn't explicitly set, WPF will try to guess it via
-            // GetEntryAssembly, which in a unit test runner will be null
-            // This is needed for the pack:// URL format to be understood.
-            if (Application.ResourceAssembly == null)
-            {
-                Application.ResourceAssembly = typeof(AvatarProvider).Assembly;
-            }
+            // Calling `Application.Current` will install pack URI scheme via Application.cctor.
+            // This is needed when unit testing for the pack:// URL format to be understood.
+            if (Application.Current != null) { }
         }
 
         [ImportingConstructor]
@@ -71,7 +68,7 @@ public IObservable<BitmapSource> GetAvatar(IAvatarContainer apiAccount)
             return imageCache.GetImage(avatarUrl)
                 .Catch<BitmapSource, Exception>(_ => Observable.Return(DefaultAvatar(apiAccount)));
         }
-            
+
         public IObservable<Unit> InvalidateAvatar(IAvatarContainer apiAccount)
         {
             return String.IsNullOrWhiteSpace(apiAccount?.Login)
@@ -87,7 +84,7 @@ BitmapImage DefaultAvatar(IAvatarContainer apiAccount)
         }
 
         protected virtual void Dispose(bool disposing)
-        {}
+        { }
 
         public void Dispose()
         {