Merge branch 'master' into refactor/connections-master

 Conflicts:
	src/GitHub.App/Models/RepositoryHost.cs
	src/GitHub.App/Services/PullRequestService.cs
	src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs
	src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs
	test/UnitTests/GitHub.App/Models/RepositoryHostTests.cs

Author: grokys

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.3.5.{build}'
+version: '2.3.6.{build}'
 skip_tags: true
 install:
 - ps: |

nuget.config

@@ -7,4 +7,7 @@
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>
-</configuration>
+  <bindingRedirects>
+    <add key="skip" value="True" />
+  </bindingRedirects>  
+</configuration>

src/DesignTimeStyleHelper/App.config

@@ -45,6 +45,14 @@
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

src/GitHub.App/GitHub.App.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,6 +16,8 @@
     <CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,8 +50,8 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)\src\common\signing.props" />
   <ItemGroup>
-    <Reference Include="LibGit2Sharp, Version=0.24.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll</HintPath>
+    <Reference Include="LibGit2Sharp, Version=0.23.1.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -231,9 +233,6 @@
     <Resource Include="Images\default_user_avatar.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
@@ -314,7 +313,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets'))" />
-    <Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
   <Import Project="..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets" Condition="Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/GitHub.App/Services/PullRequestService.cs

@@ -537,7 +537,7 @@ async Task<IPullRequestModel> PushAndCreatePR(IModelService modelService,
                 await Task.Delay(TimeSpan.FromSeconds(5));
 
             var ret = await modelService.CreatePullRequest(sourceRepository, targetRepository, sourceBranch, targetBranch, title, body);
-            await usageTracker.IncrementUpstreamPullRequestCount();
+            await usageTracker.IncrementCounter(x => x.NumberOfUpstreamPullRequests);
             return ret;
         }
 

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -64,7 +64,7 @@ public async Task CloneRepository(
             try
             {
                 await vsGitServices.Clone(cloneUrl, path, true, progress);
-                await usageTracker.IncrementCloneCount();
+                await usageTracker.IncrementCounter(x => x.NumberOfClones);
             }
             catch (Exception ex)
             {

src/GitHub.App/ViewModels/GistCreationViewModel.cs

@@ -97,7 +97,7 @@ IObservable<Gist> OnCreateGist(object unused)
             newGist.Files.Add(FileName, SelectedText);
 
             return gistPublishService.PublishGist(apiClient, newGist)
-                .Do(_ => usageTracker.IncrementCreateGistCount().Forget())
+                .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfGists).Forget())
                 .Catch<Gist, Exception>(ex =>
                 {
                     if (!ex.IsCriticalException())

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

@@ -456,7 +456,7 @@ public async Task Load(string remoteRepositoryOwner, IPullRequestModel pullReque
 
                 if (firstLoad)
                 {
-                    usageTracker.IncrementPullRequestOpened().Forget();
+                    usageTracker.IncrementCounter(x => x.NumberOfPullRequestsOpened).Forget();
                 }
 
                 if (!isInCheckout)
@@ -606,19 +606,37 @@ IObservable<Unit> DoCheckout(object unused)
                         .GetDefaultLocalBranchName(LocalRepository, Model.Number, Model.Title)
                         .SelectMany(x => pullRequestsService.Checkout(LocalRepository, Model, x));
                 }
-            }).Do(_ => usageTracker.IncrementPullRequestCheckOutCount(IsFromFork).Forget());
+            }).Do(_ =>
+            {
+                if (IsFromFork)
+                    usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestsCheckedOut).Forget();
+                else
+                    usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestsCheckedOut).Forget();
+            });
         }
 
         IObservable<Unit> DoPull(object unused)
         {
             return pullRequestsService.Pull(LocalRepository)
-                .Do(_ => usageTracker.IncrementPullRequestPullCount(IsFromFork).Forget());
+                .Do(_ =>
+                {
+                    if (IsFromFork)
+                        usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPulls).Forget();
+                    else
+                        usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPulls).Forget();
+                });
         }
 
         IObservable<Unit> DoPush(object unused)
         {
             return pullRequestsService.Push(LocalRepository)
-                .Do(_ => usageTracker.IncrementPullRequestPushCount(IsFromFork).Forget());
+                .Do(_ =>
+                {
+                    if (IsFromFork)
+                        usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPushes).Forget();
+                    else
+                        usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPushes).Forget();
+                });
         }
 
         class CheckoutCommandState : IPullRequestCheckoutState

src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs

@@ -280,7 +280,7 @@ IObservable<Unit> OnCreateRepository(object state)
                 SelectedAccount,
                 BaseRepositoryPath,
                 modelService.ApiClient)
-                .Do(_ => usageTracker.IncrementCreateCount().Forget());
+                .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposCreated).Forget());
         }
 
         ReactiveCommand<Unit> InitializeCreateRepositoryCommand()

src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs

@@ -157,7 +157,7 @@ IObservable<ProgressState> OnPublishRepository(object arg)
             var modelService = modelServiceFactory.CreateBlocking(SelectedConnection);
 
             return repositoryPublishService.PublishRepository(newRepository, account, modelService.ApiClient)
-                .Do(_ => usageTracker.IncrementPublishCount().Forget())
+                .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposPublished).Forget())
                 .Select(_ => ProgressState.Success)
                 .Catch<ProgressState, Exception>(ex =>
                 {