Merge branch 'master' into master

Author: StanleyGoldman

README.md

@@ -2,13 +2,9 @@
 
 ## Notices
 
-### VS 2017 v15.3 users, please read
+### If you are having issues with the installer, please read
 
-If you need to downgrade or uninstall the extension, **do not use** ***Revert*** in Visual Studio 2017 15.3. Instead, manually uninstall the extension with the steps listed in https://github.com/github/VisualStudio/issues/1206#issuecomment-326558902
-
-If you have a corrupted extension cache, steps for fixing it are in https://github.com/github/VisualStudio/issues/1206#issuecomment-326053090
-
-The Visual Studio 2017 15.3 installer [has a bug](https://github.com/github/VisualStudio/issues/1206) that causes a corruption of the installed extensions data when you revert an installation of the extension (see also [this MS issue](https://developercommunity.visualstudio.com/content/problem/102178/error-installing-github-extension.html)). Until VS 2017 15.4 comes out, **do not use Revert in** ***Extensions and Updates***.
+If you need to upgrade, downgrade, or uninstall the extension, and are having problems doing so, refer to this issue: https://github.com/github/VisualStudio/issues/1394 which details common problems and solutions when using the installer.
 
 ### The location of the submodules has changed as of 31-01-2017
 

scripts/Run-NUnit.ps1

@@ -40,7 +40,14 @@ $xml = Join-Path $rootDirectory "nunit-$Project.xml"
         exit -1
     }
 
-    Run-Process -Fatal $TimeoutDuration $consoleRunner $dll,"--where ""cat != Timings""","--result=$xml;format=AppVeyor"
+    $args = @()
+    if ($AppVeyor) {
+        $args = $dll, "--where", "cat!=Timings", "--result=$xml;format=AppVeyor"
+    } else {
+        $args = $dll, "--where", "cat!=Timings", "--result=$xml"
+    }
+
+    Run-Process -Fatal $TimeoutDuration $consoleRunner $args
     if (!$?) {
         Die 1 "$Project tests failed"
     }

scripts/test.ps1

@@ -30,7 +30,7 @@ if ($Trace) {
     Set-PSDebug -Trace 1
 }
 
-$env:PATH = "$$PSScriptRoot;$env:PATH"
+$env:PATH = "$PSScriptRoot;$env:PATH"
 
 $exitcode = 0
 

src/GitHub.Api/ApiClientConfiguration.cs

@@ -49,7 +49,10 @@ public static string MachineFingerprint
         {
             get
             {
-                return GetSha256Hash(Info.ApplicationInfo.ApplicationDescription + ":" + GetMachineIdentifier());
+                return GetSha256Hash(
+                    Info.ApplicationInfo.ApplicationDescription + ":" +
+                    GetMachineIdentifier() + ":" +
+                    GetMachineNameSafe());
             }
         }
 
@@ -60,13 +63,13 @@ static string GetMachineIdentifier()
             try
             {
                 // adapted from http://stackoverflow.com/a/1561067
-                var fastedValidNetworkInterface = NetworkInterface.GetAllNetworkInterfaces()
-                    .OrderBy(nic => nic.Speed)
+                var fastestValidNetworkInterface = NetworkInterface.GetAllNetworkInterfaces()
+                    .OrderByDescending(nic => nic.Speed)
                     .Where(nic => nic.OperationalStatus == OperationalStatus.Up)
                     .Select(nic => nic.GetPhysicalAddress().ToString())
-                    .FirstOrDefault(address => address.Length > 12);
+                    .FirstOrDefault(address => address.Length >= 12);
 
-                return fastedValidNetworkInterface ?? GetMachineNameSafe();
+                return fastestValidNetworkInterface ?? GetMachineNameSafe();
             }
             catch (Exception)
             {

src/GitHub.Api/LoginManager.cs

@@ -14,7 +14,7 @@ public class LoginManager : ILoginManager
     {
         readonly string[] scopes = { "user", "repo", "gist", "write:public_key" };
         readonly IKeychain keychain;
-        readonly ITwoFactorChallengeHandler twoFactorChallengeHandler;
+        readonly Lazy<ITwoFactorChallengeHandler> twoFactorChallengeHandler;
         readonly string clientId;
         readonly string clientSecret;
         readonly string authorizationNote;
@@ -31,7 +31,7 @@ public class LoginManager : ILoginManager
         /// <param name="fingerprint">The machine fingerprint.</param>
         public LoginManager(
             IKeychain keychain,
-            ITwoFactorChallengeHandler twoFactorChallengeHandler,
+            Lazy<ITwoFactorChallengeHandler> twoFactorChallengeHandler,
             string clientId,
             string clientSecret,
             string authorizationNote = null,
@@ -194,7 +194,7 @@ async Task<ApplicationAuthorization> HandleTwoFactorAuthorization(
         {
             for (;;)
             {
-                var challengeResult = await twoFactorChallengeHandler.HandleTwoFactorException(exception);
+                var challengeResult = await twoFactorChallengeHandler.Value.HandleTwoFactorException(exception);
 
                 if (challengeResult == null)
                 {
@@ -218,7 +218,7 @@ async Task<ApplicationAuthorization> HandleTwoFactorAuthorization(
                     }
                     catch (Exception e)
                     {
-                        await twoFactorChallengeHandler.ChallengeFailed(e);
+                        await twoFactorChallengeHandler.Value.ChallengeFailed(e);
                         await keychain.Delete(hostAddress).ConfigureAwait(false);
                         throw;
                     }

src/GitHub.App/Factories/ViewViewModelFactory.cs

@@ -20,14 +20,12 @@ public class ViewViewModelFactory : IViewViewModelFactory
 
         [ImportingConstructor]
         public ViewViewModelFactory(
-            IGitHubServiceProvider serviceProvider,
-            ICompositionService cc)
+            IGitHubServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
-            cc.SatisfyImportsOnce(this);
         }
 
-        [ImportMany(AllowRecomposition = true)]
+        [ImportMany]
         IEnumerable<ExportFactory<FrameworkElement, IViewModelMetadata>> Views { get; set; }
 
         /// <inheritdoc/>
@@ -45,7 +43,7 @@ public FrameworkElement CreateView<TViewModel>() where TViewModel : IViewModel
         /// <inheritdoc/>
         public FrameworkElement CreateView(Type viewModel)
         {
-            var f = Views.FirstOrDefault(x => x.Metadata.ViewModelType.Contains(viewModel));
+            var f = Views.FirstOrDefault(x => x.Metadata.ViewModelType.Contains(viewModel.FullName));
             return f?.CreateExport().Value;
         }
     }

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

@@ -46,6 +46,7 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         readonly ReactiveCommand<Unit> refresh;
         readonly ReactiveCommand<Unit> showPullRequests;
         readonly ReactiveCommand<object> openInBrowser;
+        bool initialized;
         IViewModel content;
         ILocalRepositoryModel localRepository;
         string searchQuery;
@@ -199,7 +200,7 @@ public void Dispose()
         public async Task InitializeAsync(IServiceProvider paneServiceProvider)
         {
             await UpdateContent(teServiceHolder.ActiveRepo);
-            teServiceHolder.Subscribe(this, x => UpdateContent(x).Forget());
+            teServiceHolder.Subscribe(this, x => UpdateContentIfRepositoryChanged(x).Forget());
             connectionManager.Connections.CollectionChanged += (_, __) => UpdateContent(LocalRepository).Forget();
 
             BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.pullRequestCommand, showPullRequests);
@@ -343,10 +344,11 @@ async Task NavigateTo<TViewModel>(Func<TViewModel, Task> initialize, Func<TViewM
 
         async Task UpdateContent(ILocalRepositoryModel repository)
         {
+            initialized = true;
             LocalRepository = repository;
             Connection = null;
-
             Content = null;
+            navigator.Clear();
 
             if (repository == null)
             {
@@ -370,9 +372,8 @@ async Task UpdateContent(ILocalRepositoryModel repository)
 
                 Connection = await connectionManager.GetConnection(hostAddress);
 
-                if (Connection != null)
+                if (Connection?.IsLoggedIn == true)
                 {
-                    navigator.Clear();
                     Content = navigator;
                     await ShowDefaultPage();
                 }
@@ -387,6 +388,14 @@ async Task UpdateContent(ILocalRepositoryModel repository)
             }
         }
 
+        async Task UpdateContentIfRepositoryChanged(ILocalRepositoryModel repository)
+        {
+            if (!initialized || !Equals(repository, LocalRepository))
+            {
+                await UpdateContent(repository);
+            }
+        }
+
         static async Task<bool> IsValidRepository(ISimpleApiClient client)
         {
             try

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

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel.Composition;
 using System.Linq;
-using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using GitHub.Extensions;
 using ReactiveUI;
@@ -19,7 +17,6 @@ public class NavigationViewModel : ViewModelBase, INavigationViewModel
     {
         readonly ReactiveList<IPanePageViewModel> history;
         readonly ObservableAsPropertyHelper<IPanePageViewModel> content;
-        Dictionary<IPanePageViewModel, CompositeDisposable> pageDispose;
         int index = -1;
 
         /// <summary>
@@ -42,6 +39,13 @@ public NavigationViewModel()
                 .StartWith((IPanePageViewModel)null)
                 .ToProperty(this, x => x.Content);
 
+            this.WhenAnyValue(x => x.Content)
+              .Buffer(2, 1)
+              .Subscribe(x => {
+                  if (x[0] != null && history.Contains(x[0])) x[0].Deactivated();
+                  x[1]?.Activated();
+              });
+
             NavigateBack = ReactiveCommand.Create(pos.Select(x => x.Index > 0));
             NavigateBack.Subscribe(_ => Back());
             NavigateForward = ReactiveCommand.Create(pos.Select(x => x.Index < x.Count - 1));
@@ -72,13 +76,13 @@ public void NavigateTo(IPanePageViewModel page)
         {
             Guard.ArgumentNotNull(page, nameof(page));
 
+            history.Insert(index + 1, page);
+            ++Index;
+
             if (index < history.Count - 1)
             {
                 history.RemoveRange(index + 1, history.Count - (index + 1));
             }
-
-            history.Add(page);
-            ++Index;
         }
 
         /// <inheritdoc/>
@@ -103,7 +107,7 @@ public bool Forward()
         public void Clear()
         {
             Index = -1;
-            history.Clear();
+            history.RemoveRange(0, history.Count);
         }
 
         public int RemoveAll(IPanePageViewModel page)
@@ -113,31 +117,11 @@ public int RemoveAll(IPanePageViewModel page)
             return count;
         }
 
-        public void RegisterDispose(IPanePageViewModel page, IDisposable dispose)
-        {
-            if (pageDispose == null)
-            {
-                pageDispose = new Dictionary<IPanePageViewModel, CompositeDisposable>();
-            }
-
-            CompositeDisposable item;
-
-            if (!pageDispose.TryGetValue(page, out item))
-            {
-                item = new CompositeDisposable();
-                pageDispose.Add(page, item);
-            }
-
-            item.Add(dispose);
-        }
-
         void BeforeItemAdded(IPanePageViewModel page)
         {
-            if (page.CloseRequested != null && !history.Contains(page))
+            if (!history.Contains(page))
             {
-                RegisterDispose(
-                    page,
-                    page.CloseRequested.Subscribe(_ => RemoveAll(page)));
+                page.CloseRequested.Subscribe(_ => RemoveAll(page));
             }
         }
 
@@ -150,13 +134,8 @@ void ItemRemoved(int removedIndex, IPanePageViewModel page)
 
             if (!history.Contains(page))
             {
-                CompositeDisposable dispose = null;
-
-                if (pageDispose?.TryGetValue(page, out dispose) == true)
-                {
-                    dispose.Dispose();
-                    pageDispose.Remove(page);
-                }
+                if (Content == page) page.Deactivated();
+                page.Dispose();
             }
         }
 
@@ -177,16 +156,7 @@ void CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
-                        if (pageDispose != null)
-                        {
-                            foreach (var dispose in pageDispose.Values)
-                            {
-                                dispose.Dispose();
-                            }
-
-                            pageDispose.Clear();
-                        }
-                        break;
+                        throw new NotSupportedException();
 
                     default:
                         throw new NotImplementedException();

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

@@ -12,7 +12,8 @@ namespace GitHub.ViewModels.GitHubPane
     public abstract class PanePageViewModelBase : ViewModelBase, IPanePageViewModel, IDisposable
     {
         static readonly Uri paneUri = new Uri("github://pane");
-        Subject<Uri> navigate = new Subject<Uri>();
+        readonly Subject<Uri> navigate = new Subject<Uri>();
+        readonly Subject<Unit> close = new Subject<Unit>();
         Exception error;
         bool isBusy;
         bool isLoading;
@@ -59,11 +60,21 @@ public string Title
         }
 
         /// <inheritdoc/>
-        public virtual IObservable<Unit> CloseRequested { get; }
+        public IObservable<Unit> CloseRequested => close;
 
         /// <inheritdoc/>
         public IObservable<Uri> NavigationRequested => navigate;
 
+        /// <inheritdoc/>
+        public virtual void Activated()
+        {
+        }
+
+        /// <inheritdoc/>
+        public virtual void Deactivated()
+        {
+        }
+
         /// <inheritdoc/>
         public void Dispose()
         {
@@ -74,6 +85,11 @@ public void Dispose()
         /// <inheritdoc/>
         public virtual Task Refresh() => Task.CompletedTask;
 
+        /// <summary>
+        /// Sends a request to close the page.
+        /// </summary>
+        protected void Close() => close.OnNext(Unit.Default);
+
         /// <summary>
         /// Sends a request to navigate to a new page.
         /// </summary>
@@ -86,8 +102,8 @@ protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {
-                navigate?.Dispose();
-                navigate = null;
+                close.Dispose();
+                navigate.Dispose();
             }
         }
     }

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

@@ -95,6 +95,7 @@ public PullRequestCreationViewModel(
             });
 
             Cancel = ReactiveCommand.Create();
+            Cancel.Subscribe(_ => Close());
 
             isExecuting = CreatePullRequest.IsExecuting.ToProperty(this, x => x.IsExecuting);
 
@@ -298,7 +299,5 @@ ReactivePropertyValidator BranchValidator
             get { return branchValidator; }
             set { this.RaiseAndSetIfChanged(ref branchValidator, value); }
         }
-
-        public override IObservable<Unit> CloseRequested => Cancel.SelectUnit();
     }
 }