Merge branch 'master' into fixes/1644-GitServiceHelper-avoid-MEF

Author: grokys

src/GitHub.Exports/Models/UsageModel.cs

@@ -70,6 +70,8 @@ public class MeasuresModel
             public int NumberOfShowCurrentPullRequest { get; set; }
             public int NumberOfStatusBarOpenPullRequestList { get; set; }
             public int NumberOfTeamExplorerHomeOpenPullRequestList { get; set; }
+            public int NumberOfStartPageClones { get; set; }
+            public int NumberOfGitHubConnectSectionClones { get; set; }
             public int NumberOfShowRepoForkDialogClicks { get; set; }
             public int NumberOfReposForked { get; set; }
             public int NumberOfOriginsUpdatedWhenForkingRepo { get; set; }

src/GitHub.StartPage/StartPagePackage.cs

@@ -12,6 +12,7 @@
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.CodeContainerManagement;
+using Microsoft.VisualStudio.Threading;
 using Serilog;
 using CodeContainer = Microsoft.VisualStudio.Shell.CodeContainerManagement.CodeContainer;
 using ICodeContainerProvider = Microsoft.VisualStudio.Shell.CodeContainerManagement.ICodeContainerProvider;
@@ -119,8 +120,9 @@ async Task<CloneDialogResult> ShowCloneDialog(
         {
             var dialogService = gitHubServiceProvider.GetService<IDialogService>();
             var cloneService = gitHubServiceProvider.GetService<IRepositoryCloneService>();
+            var usageTracker = gitHubServiceProvider.GetService<IUsageTracker>();
             CloneDialogResult result = null;
-            
+
             if (repository == null)
             {
                 result = await dialogService.ShowCloneDialog(null);
@@ -134,7 +136,7 @@ async Task<CloneDialogResult> ShowCloneDialog(
                     result = new CloneDialogResult(basePath, repository);
                 }
             }
-            
+
             if (result != null)
             {
                 try
@@ -144,6 +146,8 @@ await cloneService.CloneRepository(
                         result.Repository.Name,
                         result.BasePath,
                         progress);
+
+                    usageTracker.IncrementCounter(x => x.NumberOfStartPageClones).Forget();
                 }
                 catch
                 {

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection.cs

@@ -33,6 +33,7 @@ public class GitHubConnectSection : TeamExplorerSectionBase, IGitHubConnectSecti
         readonly IVSServices vsServices;
         readonly int sectionIndex;
         readonly ILocalRepositories localRepositories;
+        readonly IUsageTracker usageTracker;
 
         bool isCloning;
         bool isCreating;
@@ -99,6 +100,7 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
             IPackageSettings packageSettings,
             IVSServices vsServices,
             ILocalRepositories localRepositories,
+            IUsageTracker usageTracker,
             int index)
             : base(serviceProvider, apiFactory, holder, manager)
         {
@@ -108,6 +110,7 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
             Guard.ArgumentNotNull(packageSettings, nameof(packageSettings));
             Guard.ArgumentNotNull(vsServices, nameof(vsServices));
             Guard.ArgumentNotNull(localRepositories, nameof(localRepositories));
+            Guard.ArgumentNotNull(usageTracker, nameof(usageTracker));
 
             Title = "GitHub";
             IsEnabled = true;
@@ -118,6 +121,7 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
             this.packageSettings = packageSettings;
             this.vsServices = vsServices;
             this.localRepositories = localRepositories;
+            this.usageTracker = usageTracker;
 
             Clone = CreateAsyncCommandHack(DoClone);
 
@@ -141,6 +145,8 @@ await cloneService.CloneRepository(
                         result.Repository.CloneUrl,
                         result.Repository.Name,
                         result.BasePath);
+
+                    usageTracker.IncrementCounter(x => x.NumberOfGitHubConnectSectionClones).Forget();
                 }
                 catch (Exception e)
                 {

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection0.cs

@@ -1,5 +1,4 @@
 using GitHub.Api;
-using GitHub.Models;
 using GitHub.Services;
 using GitHub.Settings;
 using Microsoft.TeamFoundation.Controls;
@@ -20,8 +19,9 @@ public GitHubConnectSection0(IGitHubServiceProvider serviceProvider,
             IConnectionManager manager,
             IPackageSettings settings,
             IVSServices vsServices,
-            ILocalRepositories localRepositories)
-            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, localRepositories, 0)
+            ILocalRepositories localRepositories,
+            IUsageTracker usageTracker)
+            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, localRepositories, usageTracker, 0)
         {
         }
     }

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection1.cs

@@ -1,5 +1,4 @@
 using GitHub.Api;
-using GitHub.Models;
 using GitHub.Services;
 using GitHub.Settings;
 using Microsoft.TeamFoundation.Controls;
@@ -20,8 +19,9 @@ public GitHubConnectSection1(IGitHubServiceProvider serviceProvider,
             IConnectionManager manager,
             IPackageSettings settings,
             IVSServices vsServices,
-            ILocalRepositories localRepositories)
-            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, localRepositories, 1)
+            ILocalRepositories localRepositories,
+            IUsageTracker usageTracker)
+            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, localRepositories, usageTracker, 1)
         {
         }
     }