Merge branch 'spike/zero-impact-2019' into appveyor-build-zero-impact

Author: jcansdale

src/GitHub.VisualStudio.16/CompositionServices.cs

@@ -11,6 +11,7 @@
 using GitHub.Factories;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.VisualStudio.Settings;
 using GitHub.VisualStudio.Views;
 using GitHub.VisualStudio.Views.Dialog.Clone;
 using Microsoft.VisualStudio.Shell;
@@ -21,7 +22,38 @@ namespace GitHub.VisualStudio
 {
     public class CompositionServices
     {
-        public CompositionContainer CreateCompositionContainer(ExportProvider defaultExportProvider)
+        public CompositionContainer CreateVisualStudioCompositionContainer(ExportProvider defaultExportProvider)
+        {
+            var compositionContainer = CreateCompositionContainer(defaultExportProvider);
+
+            var gitHubServiceProvider = compositionContainer.GetExportedValue<IGitHubServiceProvider>();
+            var packageSettings = new PackageSettings(gitHubServiceProvider);
+            var usageService = compositionContainer.GetExportedValue<IUsageService>();
+            var usageTracker = new UsageTracker(gitHubServiceProvider, usageService, packageSettings);
+            compositionContainer.ComposeExportedValue<IUsageTracker>(usageTracker);
+
+            return compositionContainer;
+        }
+
+        public CompositionContainer CreateOutOfProcCompositionContainer()
+        {
+            var compositionContainer = CreateCompositionContainer(CreateOutOfProcExports());
+
+            var usageTracker = new OutOfProcUsageTracker();
+            compositionContainer.ComposeExportedValue<IUsageTracker>(usageTracker);
+
+            return compositionContainer;
+        }
+
+        static CompositionContainer CreateOutOfProcExports()
+        {
+            var container = new CompositionContainer();
+            var serviceProvider = new OutOfProcSVsServiceProvider();
+            container.ComposeExportedValue<SVsServiceProvider>(serviceProvider);
+            return container;
+        }
+
+        static CompositionContainer CreateCompositionContainer(ExportProvider defaultExportProvider)
         {
             var catalog = new LoggingCatalog(
                 GetCatalog(typeof(DialogService).Assembly), // GitHub.App
@@ -39,9 +71,6 @@ public CompositionContainer CreateCompositionContainer(ExportProvider defaultExp
             var gitHubServiceProvider = new MyGitHubServiceProvider(compositionContainer);
             compositionContainer.ComposeExportedValue<IGitHubServiceProvider>(gitHubServiceProvider);
 
-            var usageTracker = new MyUsageTracker();
-            compositionContainer.ComposeExportedValue<IUsageTracker>(usageTracker);
-
             var loginManager = CreateLoginManager(compositionContainer);
             compositionContainer.ComposeExportedValue<ILoginManager>(loginManager);
 
@@ -58,7 +87,7 @@ static void InitializeViewLocator(IViewViewModelFactory viewViewModelFactory)
             factoryProviderFiled.SetValue(null, viewViewModelFactory);
         }
 
-        private static LoginManager CreateLoginManager(CompositionContainer compositionContainer)
+        static LoginManager CreateLoginManager(CompositionContainer compositionContainer)
         {
             var keychain = compositionContainer.GetExportedValue<IKeychain>();
             var lazy2Fa = new Lazy<ITwoFactorChallengeHandler>(() => compositionContainer.GetExportedValue<ITwoFactorChallengeHandler>());
@@ -185,7 +214,7 @@ public object TryGetService(string typeName)
         public ExportProvider ExportProvider { get; }
     }
 
-    public class MyUsageTracker : IUsageTracker
+    public class OutOfProcUsageTracker : IUsageTracker
     {
         public Task IncrementCounter(Expression<Func<UsageModel.MeasuresModel, int>> counter)
         {
@@ -194,6 +223,15 @@ public Task IncrementCounter(Expression<Func<UsageModel.MeasuresModel, int>> cou
         }
     }
 
+    class OutOfProcSVsServiceProvider : SVsServiceProvider
+    {
+        public object GetService(Type serviceType)
+        {
+            Console.WriteLine($"GetService: {serviceType}");
+            return null;
+        }
+    }
+
     public class LoggingCatalog : AggregateCatalog
     {
         public LoggingCatalog(params ComposablePartCatalog[] catalogs) : base(catalogs) { }

src/GitHub.VisualStudio.16/InBoxExtensionServices.cs

@@ -70,7 +70,7 @@ static async Task<CloneDialogResult> ShowCloneDialogAsync(IComponentModel compon
                 IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
             {
                 var compositionServices = new CompositionServices();
-                var compositionContainer = compositionServices.CreateCompositionContainer(componentModel.DefaultExportProvider);
+                var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
 
                 var dialogService = compositionContainer.GetExportedValue<IDialogService>();
                 var cloneDialogResult = await dialogService.ShowCloneDialog(null, url);

src/GitHub.VisualStudio.TestApp/MainWindow.xaml.cs

@@ -71,30 +71,12 @@ async Task CloneOrOpenRepositoryAsync()
         CompositionContainer CreateCompositionContainer()
         {
             var compositionServices = new CompositionServices();
-            var exports = CreateOutOfProcExports();
-            var compositionContainer = compositionServices.CreateCompositionContainer(exports);
+            var compositionContainer = compositionServices.CreateOutOfProcCompositionContainer();
 
             var gitHubServiceProvider = compositionContainer.GetExportedValue<IGitHubServiceProvider>();
             var externalShowDialogService = new ExternalShowDialogService(gitHubServiceProvider, this);
             compositionContainer.ComposeExportedValue<IShowDialogService>(externalShowDialogService);
             return compositionContainer;
         }
-
-        static CompositionContainer CreateOutOfProcExports()
-        {
-            var container = new CompositionContainer();
-            var serviceProvider = new MySVsServiceProvider();
-            container.ComposeExportedValue<SVsServiceProvider>(serviceProvider);
-            return container;
-        }
-
-        class MySVsServiceProvider : SVsServiceProvider
-        {
-            public object GetService(Type serviceType)
-            {
-                Console.WriteLine($"GetService: {serviceType}");
-                return null;
-            }
-        }
     }
 }