Merge branch 'master' into fixes/267-property-page-not-loading

Author: haacked

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

@@ -4,13 +4,15 @@
 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>();
 
@@ -24,6 +26,7 @@ public IBlobCache CreateBlobCache(string path)
             {
                 var c = new SQLitePersistentBlobCache(path);
                 cache.Add(path, c);
+                disposables.Add(c);
                 return c;
             }
             catch(Exception ex)
@@ -32,5 +35,23 @@ public IBlobCache CreateBlobCache(string path)
                 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/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.UI/Assets/Controls/FilterTextBox.xaml

@@ -13,7 +13,6 @@
         <Setter Property="AllowDrop" Value="true"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Height" Value="24" />
         <Setter Property="Padding" Value="3,3,18,3" />
         <Setter Property="ContextMenu" Value="{DynamicResource DefaultContextMenu}" />
         <Setter Property="Template">

src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml

@@ -74,8 +74,7 @@
     </GroupBox.Header>
     <DockPanel>
       <WrapPanel DockPanel.Dock="Top">
-        <CheckBox x:Name="chkMetrics" VerticalAlignment="Center" />
-        <Label Content="{x:Static prop:Resources.Options_MetricsLabel}" />
+        <CheckBox x:Name="chkMetrics" VerticalAlignment="Center" Content="{x:Static prop:Resources.Options_MetricsLabel}" />
       </WrapPanel>
       <TextBlock>
         <Hyperlink ToolTip="https://visualstudio.github.com/samples.html" NavigateUri="https://visualstudio.github.com/samples.html" RequestNavigate="Hyperlink_RequestNavigate"><TextBlock Text="{x:Static prop:Resources.learnMoreLink}"/></Hyperlink>

src/GitHub.VisualStudio/UI/WindowController.xaml

@@ -15,6 +15,11 @@
         HasMinimizeButton="False"
         HasMaximizeButton="False"
         Background="White"
+        FontFamily="Segoe UI"
+        FontSize="12"
+        FontStretch="Normal"
+        FontStyle="Normal"
+        FontWeight="Normal"
         SnapsToDevicePixels="True"
         UseLayoutRounding="True">
     <Grid x:Name="Container">