Merge feature/pr/views into pr-list-polish

Author: shana

GitHubVS.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25029.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
 EndProject
@@ -42,23 +42,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Script", "Script", "{7B6C5F
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		script\Announce.ps1 = script\Announce.ps1
 		script\Bootstrap.ps1 = script\Bootstrap.ps1
 		build.cmd = build.cmd
 		script\Bump-Version.ps1 = script\Bump-Version.ps1
 		script\cibuild.ps1 = script\cibuild.ps1
 		script\common.ps1 = script\common.ps1
 		script\Deploy.ps1 = script\Deploy.ps1
 		script\Get-CheckedOutBranch.ps1 = script\Get-CheckedOutBranch.ps1
+		script\Get-HeadSha1.ps1 = script\Get-HeadSha1.ps1
 		script\HubotTell-NativeRoom.ps1 = script\HubotTell-NativeRoom.ps1
 		nuget.config = nuget.config
 		script\Require-CleanWorkTree.ps1 = script\Require-CleanWorkTree.ps1
-		script\SolutionInfo.cs = script\SolutionInfo.cs
-		script\Upload-DirectoryToS3.ps1 = script\Upload-DirectoryToS3.ps1
-		script\Announce.ps1 = script\Announce.ps1
-		script\Get-HeadSha1.ps1 = script\Get-HeadSha1.ps1
 		script\Run-NUnit.ps1 = script\Run-NUnit.ps1
 		script\Run-XUnit.ps1 = script\Run-XUnit.ps1
-
+		script\SolutionInfo.cs = script\SolutionInfo.cs
+		script\Upload-DirectoryToS3.ps1 = script\Upload-DirectoryToS3.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8A7DA2E7-262B-4581-807A-1C45CE79CDFD}"
@@ -545,8 +544,8 @@ Global
 		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|x86.ActiveCfg = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|x86.Build.0 = Release|Any CPU
-		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
-		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
+		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
+		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|x86.ActiveCfg = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|x86.Build.0 = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -561,8 +560,8 @@ Global
 		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|x86.ActiveCfg = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|x86.Build.0 = Release|Any CPU
-		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
-		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
+		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
+		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|x86.ActiveCfg = Release|Any CPU
 		{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|x86.Build.0 = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -577,8 +576,8 @@ Global
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|x86.ActiveCfg = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|x86.Build.0 = Release|Any CPU
-		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
-		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
+		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.ActiveCfg = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.Build.0 = Release|Any CPU
 	EndGlobalSection

script

@@ -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/HostCacheFactory.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/IBlobCacheFactory.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/IHostCacheFactory.cs

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

src/GitHub.App/Factories/RepositoryHostFactory.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/Factories/SqlitePersistentBlobCacheFactory.cs

@@ -43,10 +43,10 @@ public IUIPair CreateViewAndViewModel(UIViewType viewType)
     /// </summary>
     public class UIPair : IUIPair
     {
-        ExportLifetimeContext<IView> view;
-        ExportLifetimeContext<IViewModel> viewModel;
-        CompositeDisposable handlers = new CompositeDisposable();
-        UIViewType viewType;
+        readonly ExportLifetimeContext<IView> view;
+        readonly ExportLifetimeContext<IViewModel> viewModel;
+        readonly CompositeDisposable handlers = new CompositeDisposable();
+        readonly UIViewType viewType;
 
         public UIViewType ViewType => viewType;
         public IView View => view.Value;
@@ -88,9 +88,7 @@ void Dispose(bool disposing)
                 if (!handlers.IsDisposed)
                     handlers.Dispose();
                 view?.Dispose();
-                view = null;
                 viewModel?.Dispose();
-                viewModel = null;
                 disposed = true;
             }
         }

src/GitHub.App/Factories/UIFactory.cs

@@ -131,6 +131,7 @@
     <Compile Include="SampleData\AccountDesigner.cs" />
     <Compile Include="SampleData\PullRequestCreationViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestDetailViewModelDesigner.cs" />
+    <Compile Include="SampleData\LoggedOutViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestListViewModelDesigner.cs" />
     <Compile Include="Services\AvatarProvider.cs" />
     <Compile Include="Services\GitHubCredentialProvider.cs" />

src/GitHub.App/GitHub.App.csproj

@@ -0,0 +1,18 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive.Linq;
+using System.Windows.Input;
+using GitHub.Collections;
+using GitHub.Models;
+using GitHub.ViewModels;
+
+namespace GitHub.SampleData
+{
+    [ExcludeFromCodeCoverage]
+    public class LoggedOutViewModelDesigner : BaseViewModelDesigner, IViewModel
+    {
+        public LoggedOutViewModelDesigner()
+        {
+        }
+    }
+}