Merge branch 'master' into bump-libgit2sharp-octokit

Author: shana

documentation/manifest.md

@@ -93,9 +93,9 @@
         - [ ] Verify Issues button navigates to Issues page on GitHub.com (when logged in and the repository is enabled)
 - [ ] **Creating Multiple Repositories**
     - [ ] Go to Team Explorer Connect page (logged in)
-    - [ ] Create additional repository
-    - [ ] Publish new repository
-    - [ ] Verify remote information present in repository settings
+      - [ ] Create additional repository
+        - [ ] Publish new repository
+          - [ ] Verify remote information present in repository settings
 - [ ] **Validate Publish Repository Error**
     - [ ] Remove remote settings from repository
     - [ ] Go to Sync page and publish repository
@@ -121,3 +121,10 @@
 - [ ] **Login with 2FA on**
       - [ ] Login GitHub with 2FA turned on
       - [ ] Resend works
+
+# Settings
+- [ ] **Property page loads outside of team explorer view**
+  - [ ] Select solution explorer as focused pane
+  - [ ] Restart Visual Studio
+  - [ ] Go to GitHub for VS property pane in Options
+    - [ ] Property page loads without errors

src/GitHub.App/Factories/HostCacheFactory.cs

@@ -39,5 +39,23 @@ public IBlobCache Create(HostAddress hostAddress)
 
         IOperatingSystem OperatingSystem { get { return operatingSystem.Value; } }
         IBlobCacheFactory BlobCacheFactory { get { return blobCacheFactory.Value; } }
+
+        bool disposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (disposed) return;
+                disposed = true;
+                if (blobCacheFactory.IsValueCreated)
+                    blobCacheFactory.Value.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

src/GitHub.App/Factories/IBlobCacheFactory.cs

@@ -1,8 +1,9 @@
 using Akavache;
+using System;
 
 namespace GitHub.Factories
 {
-    public interface IBlobCacheFactory
+    public interface IBlobCacheFactory : IDisposable
     {
         IBlobCache CreateBlobCache(string path);
     }

src/GitHub.App/Factories/IHostCacheFactory.cs

@@ -1,9 +1,10 @@
 using Akavache;
 using GitHub.Primitives;
+using System;
 
 namespace GitHub.Factories
 {
-    public interface IHostCacheFactory
+    public interface IHostCacheFactory : IDisposable
     {
         IBlobCache Create(HostAddress hostAddress);
     }

src/GitHub.App/Factories/RepositoryHostFactory.cs

@@ -51,6 +51,7 @@ protected virtual void Dispose(bool disposing)
 
                 loginCache.Dispose();
                 avatarProvider.Dispose();
+                hostCacheFactory.Dispose();
                 disposed = true;
             }
         }

src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs

@@ -2,29 +2,56 @@
 using Akavache.Sqlite3;
 using NLog;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Reactive.Disposables;
 
 namespace GitHub.Factories
 {
     [Export(typeof(IBlobCacheFactory))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class SqlitePersistentBlobCacheFactory : IBlobCacheFactory
     {
+        readonly CompositeDisposable disposables = new CompositeDisposable();
         static readonly Logger log = LogManager.GetCurrentClassLogger();
+        Dictionary<string, IBlobCache> cache = new Dictionary<string, IBlobCache>();
 
         public IBlobCache CreateBlobCache(string path)
         {
             Guard.ArgumentNotEmptyString(path, nameof(path));
+            if (cache.ContainsKey(path))
+                return cache[path];
 
             try
             {
-                return new SQLitePersistentBlobCache(path);
+                var c = new SQLitePersistentBlobCache(path);
+                cache.Add(path, c);
+                disposables.Add(c);
+                return c;
             }
             catch(Exception ex)
             {
                 log.Error("Error while creating SQLitePersistentBlobCache for {0}. {1}", path, ex);
                 return new InMemoryBlobCache();
             }
         }
+
+        bool disposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (disposed) return;
+                disposed = true;
+                disposables.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
     }
 }

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -525,9 +525,9 @@ public class GitHubHomeSectionDesigner : IGitHubHomeSection
     {
         public GitHubHomeSectionDesigner()
         {
-            Icon = Octicon.@lock;
+            Icon = Octicon.repo;
             RepoName = "octokit";
-            RepoUrl = "https://github.com/octokit/octokit.net";
+            RepoUrl = "https://github.com/octokit/something-really-long-here-to-check-for-trimming";
         }
 
         public Octicon Icon

src/GitHub.App/Services/ModelService.cs

@@ -277,15 +277,6 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 if (disposed) return;
-
-                try
-                {
-                    hostCache.Dispose();
-                }
-                catch (Exception e)
-                {
-                    log.Warn("Exception occured while disposing host cache", e);
-                }
                 disposed = true;
             }
         }

src/GitHub.App/ViewModels/LoginControlViewModel.cs

@@ -45,7 +45,7 @@ public LoginControlViewModel(
 
                 }).ToProperty(this, x => x.LoginMode);
 
-            AuthenticationResults = Observable.Amb(
+            AuthenticationResults = Observable.Merge(
                 loginToGitHubViewModel.Login,
                 EnterpriseLogin.Login);
             CancelCommand = ReactiveCommand.Create();

src/GitHub.Exports/GitHub.Exports.csproj

@@ -136,6 +136,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>IPackageSettings.tt</DependentUpon>
     </Compile>
+    <Compile Include="Settings\GitHubConnectSectionState.cs" />
+    <Compile Include="Settings\UIState.cs" />
     <Compile Include="ViewModels\IServiceProviderAware.cs" />
     <Compile Include="UI\IView.cs" />
     <Compile Include="UI\Octicon.cs" />