Revert "Revert "Avoid hitting the UI thread when retrieving MEF speci…

…fic services (#4229)" (#4242)"

This reverts commit fcb4b9a.

src/NuGet.Clients/NuGet.Console/PowerConsoleToolWindow.cs

@@ -683,7 +683,7 @@ private IOutputConsole VSOutputConsole
                 {
                     _vsOutputConsole = NuGetUIThreadHelper.JoinableTaskFactory.Run(async () =>
                     {
-                        var consoleProvider = await ServiceLocator.GetInstanceAsync<IOutputConsoleProvider>();
+                        var consoleProvider = await ServiceLocator.GetComponentModelServiceAsync<IOutputConsoleProvider>();
                         if (null != consoleProvider)
                         {
                             return await consoleProvider.CreatePackageManagerConsoleAsync();
@@ -703,7 +703,7 @@ private IConsoleStatus ConsoleStatus
             {
                 if (_consoleStatus == null)
                 {
-                    _consoleStatus = ServiceLocator.GetInstance<IConsoleStatus>();
+                    _consoleStatus = ServiceLocator.GetComponentModelService<IConsoleStatus>();
                     Debug.Assert(_consoleStatus != null);
                 }
 

src/NuGet.Clients/NuGet.Console/Xamls/ConsoleContainer.xaml.cs

@@ -48,9 +48,9 @@ await System.Threading.Tasks.Task.Run(
 
                             Assumes.NotNull(_solutionManager);
 
-                            var productUpdateService = ServiceLocator.GetInstance<IProductUpdateService>();
-                            var packageRestoreManager = ServiceLocator.GetInstance<IPackageRestoreManager>();
-                            var deleteOnRestartManager = ServiceLocator.GetInstance<IDeleteOnRestartManager>();
+                            var productUpdateService = ServiceLocator.GetComponentModelService<IProductUpdateService>();
+                            var packageRestoreManager = ServiceLocator.GetComponentModelService<IPackageRestoreManager>();
+                            var deleteOnRestartManager = ServiceLocator.GetComponentModelService<IDeleteOnRestartManager>();
                             var shell = ServiceLocator.GetGlobalService<SVsShell, IVsShell4>();
 
                             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();

src/NuGet.Clients/NuGet.PackageManagement.PowerShellCmdlets/Cmdlets/UninstallPackageCommand.cs

@@ -25,8 +25,8 @@ public class UninstallPackageCommand : NuGetPowerShellBaseCommand
 
         public UninstallPackageCommand()
         {
-            _deleteOnRestartManager = ServiceLocator.GetInstance<IDeleteOnRestartManager>();
-            _lockService = ServiceLocator.GetInstance<INuGetLockService>();
+            _deleteOnRestartManager = ServiceLocator.GetComponentModelService<IDeleteOnRestartManager>();
+            _lockService = ServiceLocator.GetComponentModelService<INuGetLockService>();
         }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, Position = 0)]

src/NuGet.Clients/NuGet.PackageManagement.PowerShellCmdlets/NuGetPowerShellBaseCommand.cs

@@ -68,14 +68,14 @@ public abstract class NuGetPowerShellBaseCommand : PSCmdlet, IPSNuGetProjectCont
 
         protected NuGetPowerShellBaseCommand()
         {
-            _sourceRepositoryProvider = ServiceLocator.GetInstance<ISourceRepositoryProvider>();
-            ConfigSettings = ServiceLocator.GetInstance<Configuration.ISettings>();
-            VsSolutionManager = ServiceLocator.GetInstance<IVsSolutionManager>();
+            _sourceRepositoryProvider = ServiceLocator.GetComponentModelService<ISourceRepositoryProvider>();
+            ConfigSettings = ServiceLocator.GetComponentModelService<Configuration.ISettings>();
+            VsSolutionManager = ServiceLocator.GetComponentModelService<IVsSolutionManager>();
             DTE = ServiceLocator.GetInstance<DTE>();
-            SourceControlManagerProvider = ServiceLocator.GetInstance<ISourceControlManagerProvider>();
-            _commonOperations = ServiceLocator.GetInstance<ICommonOperations>();
-            PackageRestoreManager = ServiceLocator.GetInstance<IPackageRestoreManager>();
-            _deleteOnRestartManager = ServiceLocator.GetInstance<IDeleteOnRestartManager>();
+            SourceControlManagerProvider = ServiceLocator.GetComponentModelService<ISourceControlManagerProvider>();
+            _commonOperations = ServiceLocator.GetComponentModelService<ICommonOperations>();
+            PackageRestoreManager = ServiceLocator.GetComponentModelService<IPackageRestoreManager>();
+            _deleteOnRestartManager = ServiceLocator.GetComponentModelService<IDeleteOnRestartManager>();
 
             var logger = new LoggerAdapter(this);
             PackageExtractionContext = new PackageExtractionContext(

src/NuGet.Clients/NuGet.PackageManagement.PowerShellCmdlets/PackageActionBaseCommand.cs

@@ -29,8 +29,8 @@ public class PackageActionBaseCommand : NuGetPowerShellBaseCommand
 
         public PackageActionBaseCommand()
         {
-            _deleteOnRestartManager = ServiceLocator.GetInstance<IDeleteOnRestartManager>();
-            _lockService = ServiceLocator.GetInstance<INuGetLockService>();
+            _deleteOnRestartManager = ServiceLocator.GetComponentModelService<IDeleteOnRestartManager>();
+            _lockService = ServiceLocator.GetComponentModelService<INuGetLockService>();
         }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, Position = 0)]

src/NuGet.Clients/NuGet.PackageManagement.UI/Options/GeneralOptionControl.cs

@@ -25,8 +25,8 @@ public partial class GeneralOptionControl : UserControl
         public GeneralOptionControl()
         {
             InitializeComponent();
-            _settings = ServiceLocator.GetInstance<Configuration.ISettings>();
-            _outputConsoleLogger = ServiceLocator.GetInstance<INuGetUILogger>();
+            _settings = ServiceLocator.GetComponentModelService<ISettings>();
+            _outputConsoleLogger = ServiceLocator.GetComponentModelService<INuGetUILogger>();
             _localsCommandRunner = new LocalsCommandRunner();
             AutoScroll = true;
             Debug.Assert(_settings != null);
@@ -150,7 +150,7 @@ private void OnLocalsCommandButtonOnClick(object sender, EventArgs e)
         {
             UpdateLocalsCommandStatusText(string.Format(Resources.ShowMessage_LocalsCommandWorking), visibility: true);
             var arguments = new List<string> { "all" };
-            var settings = ServiceLocator.GetInstance<ISettings>();
+            var settings = ServiceLocator.GetComponentModelService<ISettings>();
             var logError = new LocalsArgs.Log(LogError);
             var logInformation = new LocalsArgs.Log(LogInformation);
             var localsArgs = new LocalsArgs(arguments, settings, logInformation, logError, clear: true, list: false);

src/NuGet.Clients/NuGet.PackageManagement.UI/Options/OptionsPageBase.cs

@@ -45,7 +45,7 @@ private void OnTimerTick(object sender, EventArgs e)
             timer.Stop();
             timer.Dispose();
 
-            var optionsPageActivator = ServiceLocator.GetInstance<IOptionsPageActivator>();
+            var optionsPageActivator = ServiceLocator.GetComponentModelService<IOptionsPageActivator>();
             if (optionsPageActivator != null)
             {
                 optionsPageActivator.NotifyOptionsDialogClosed();

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagerControl.xaml.cs

@@ -86,7 +86,7 @@ private async ValueTask InitializeAsync(PackageManagerModel model, INuGetUILogge
 
             Model = model;
             _uiLogger = uiLogger;
-            Settings = await ServiceLocator.GetInstanceAsync<ISettings>();
+            Settings = await ServiceLocator.GetComponentModelServiceAsync<ISettings>();
 
             _windowSearchHostFactory = await ServiceLocator.GetGlobalServiceAsync<SVsWindowSearchHostFactory, IVsWindowSearchHostFactory>();
             _serviceBroker = model.Context.ServiceBroker;
@@ -882,7 +882,7 @@ private async Task<bool> GetUseRecommendedPackagesAsync(PackageLoadContext loadC
                 _recommendPackages = true;
             }
 
-            NuGetExperimentationService = await ServiceLocator.GetInstanceAsync<INuGetExperimentationService>();
+            NuGetExperimentationService = await ServiceLocator.GetComponentModelServiceAsync<INuGetExperimentationService>();
             // Check for A/B experiment here. For control group, return false instead of _recommendPackages
             if (IsRecommenderFlightEnabled(NuGetExperimentationService))
             {

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Services/NuGetPackageSearchService.cs

@@ -335,7 +335,7 @@ private async ValueTask<IInstalledAndTransitivePackages> GetInstalledAndTransiti
             CancellationToken cancellationToken)
         {
             var logger = new VisualStudioActivityLogger();
-            var uiLogger = ServiceLocator.GetInstance<INuGetUILogger>();
+            var uiLogger = await ServiceLocator.GetComponentModelServiceAsync<INuGetUILogger>();
             var packageFeeds = (mainFeed: (IPackageFeed?)null, recommenderFeed: (IPackageFeed?)null);
 
             if (itemFilter == ItemFilter.All && recommendPackages == false)
@@ -414,7 +414,7 @@ private async Task<IReadOnlyList<SourceRepository>> GetGlobalPackageFolderReposi
         private async Task<SourceRepository> GetPackagesFolderSourceRepositoryAsync()
         {
             IVsSolutionManager solutionManager = await _sharedServiceState.SolutionManager.GetValueAsync();
-            ISettings settings = ServiceLocator.GetInstance<ISettings>();
+            ISettings settings = await ServiceLocator.GetComponentModelServiceAsync<ISettings>();
 
             return _sharedServiceState.SourceRepositoryProvider.CreateRepository(
                 new PackageSource(PackagesFolderPathUtility.GetPackagesFolderPath(solutionManager, settings)),

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Services/NuGetProjectManagerService.cs

@@ -349,7 +349,7 @@ await CatchAndRethrowExceptionAsync(async () =>
 
                 try
                 {
-                    projectContext = await ServiceLocator.GetInstanceAsync<INuGetProjectContext>();
+                    projectContext = await ServiceLocator.GetComponentModelServiceAsync<INuGetProjectContext>();
 
                     Assumes.NotNull(projectContext);
 
@@ -418,7 +418,7 @@ public async ValueTask<IReadOnlyList<ProjectAction>> GetInstallActionsAsync(
 
                 Assumes.NotNullOrEmpty(sourceRepositories);
 
-                INuGetProjectContext projectContext = await ServiceLocator.GetInstanceAsync<INuGetProjectContext>();
+                INuGetProjectContext projectContext = await ServiceLocator.GetComponentModelServiceAsync<INuGetProjectContext>();
                 IReadOnlyList<NuGetProject> projects = await GetProjectsAsync(projectIds, cancellationToken);
 
                 var resolutionContext = new ResolutionContext(
@@ -471,7 +471,7 @@ public async ValueTask<IReadOnlyList<ProjectAction>> GetUninstallActionsAsync(
 
             return await CatchAndRethrowExceptionAsync(async () =>
             {
-                INuGetProjectContext projectContext = await ServiceLocator.GetInstanceAsync<INuGetProjectContext>();
+                INuGetProjectContext projectContext = await ServiceLocator.GetComponentModelServiceAsync<INuGetProjectContext>();
                 IReadOnlyList<NuGetProject> projects = await GetProjectsAsync(projectIds, cancellationToken);
 
                 var projectActions = new List<ProjectAction>();
@@ -541,7 +541,7 @@ public async ValueTask<IReadOnlyList<ProjectAction>> GetUpdateActionsAsync(
                     }
                 }
 
-                INuGetProjectContext projectContext = await ServiceLocator.GetInstanceAsync<INuGetProjectContext>();
+                INuGetProjectContext projectContext = await ServiceLocator.GetComponentModelServiceAsync<INuGetProjectContext>();
                 IReadOnlyList<NuGetProject> projects = await GetProjectsAsync(projectIds, cancellationToken);
 
                 var resolutionContext = new ResolutionContext(

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Services/NuGetProjectUpgraderService.cs

@@ -150,7 +150,7 @@ public async ValueTask UninstallPackagesAsync(
             NuGetPackageManager packageManager = await _state.GetPackageManagerAsync(cancellationToken);
             Assumes.NotNull(packageManager);
 
-            INuGetProjectContext projectContext = await ServiceLocator.GetInstanceAsync<INuGetProjectContext>();
+            INuGetProjectContext projectContext = await ServiceLocator.GetComponentModelServiceAsync<INuGetProjectContext>();
             Assumes.NotNull(projectContext);
 
             await packageManager.ExecuteNuGetProjectActionsAsync(
@@ -186,7 +186,7 @@ public async ValueTask InstallPackagesAsync(
             NuGetPackageManager packageManager = await _state.GetPackageManagerAsync(cancellationToken);
             Assumes.NotNull(packageManager);
 
-            INuGetProjectContext projectContext = await ServiceLocator.GetInstanceAsync<INuGetProjectContext>();
+            INuGetProjectContext projectContext = await ServiceLocator.GetComponentModelServiceAsync<INuGetProjectContext>();
             Assumes.NotNull(projectContext);
 
             await packageManager.ExecuteBuildIntegratedProjectActionsAsync(

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Services/SharedServiceState.cs

@@ -27,7 +27,7 @@ internal SharedServiceState(ISourceRepositoryProvider sourceRepositoryProvider)
             SourceRepositoryProvider.PackageSourceProvider.PackageSourcesChanged += PackageSourcesChanged;
 
             SolutionManager = new AsyncLazy<IVsSolutionManager>(
-                ServiceLocator.GetInstanceAsync<IVsSolutionManager>,
+                ServiceLocator.GetComponentModelServiceAsync<IVsSolutionManager>,
                 NuGetUIThreadHelper.JoinableTaskFactory);
 
             SourceRepositories = new AsyncLazy<IReadOnlyCollection<SourceRepository>>(
@@ -41,15 +41,15 @@ internal SharedServiceState(ISourceRepositoryProvider sourceRepositoryProvider)
 
         public static async ValueTask<SharedServiceState> CreateAsync(CancellationToken cancellationToken)
         {
-            var sourceRepositoryProvider = await ServiceLocator.GetInstanceAsync<ISourceRepositoryProvider>();
+            var sourceRepositoryProvider = await ServiceLocator.GetComponentModelServiceAsync<ISourceRepositoryProvider>();
 
             return new SharedServiceState(sourceRepositoryProvider);
         }
 
         public async ValueTask<NuGetPackageManager> GetPackageManagerAsync(CancellationToken cancellationToken)
         {
-            IDeleteOnRestartManager deleteOnRestartManager = await ServiceLocator.GetInstanceAsync<IDeleteOnRestartManager>();
-            ISettings settings = await ServiceLocator.GetInstanceAsync<ISettings>();
+            IDeleteOnRestartManager deleteOnRestartManager = await ServiceLocator.GetComponentModelServiceAsync<IDeleteOnRestartManager>();
+            ISettings settings = await ServiceLocator.GetComponentModelServiceAsync<ISettings>();
             IVsSolutionManager solutionManager = await SolutionManager.GetValueAsync(cancellationToken);
 
             return new NuGetPackageManager(

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Utility/NuGetProjectUpgradeUtility.cs

@@ -86,7 +86,7 @@ public static async Task<bool> IsNuGetProjectUpgradeableAsync(NuGetProject nuGet
 
         private static async Task<NuGetProject> GetNuGetProject(Project envDTEProject)
         {
-            var solutionManager = ServiceLocator.GetInstance<IVsSolutionManager>();
+            var solutionManager = await ServiceLocator.GetComponentModelServiceAsync<IVsSolutionManager>();
 
             var projectSafeName = await envDTEProject.GetCustomUniqueNameAsync();
             var nuGetProject = await solutionManager.GetNuGetProjectAsync(projectSafeName);

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Utility/ProjectRetargetingUtility.cs

@@ -43,7 +43,7 @@ public static async Task<IList<PackageIdentity>> GetPackagesToBeReinstalled(NuGe
             if (installedRefs != null && installedRefs.Any())
             {
                 var targetFramework = project.GetMetadata<NuGetFramework>(NuGetProjectMetadataKeys.TargetFramework);
-                return GetPackagesToBeReinstalled(targetFramework, installedRefs);
+                return await GetPackagesToBeReinstalledAsync(targetFramework, installedRefs);
             }
 
             return new List<PackageIdentity>();
@@ -55,16 +55,16 @@ public static async Task<IList<PackageIdentity>> GetPackagesToBeReinstalled(NuGe
         /// <param name="projectFramework">Current target framework of the project</param>
         /// <param name="packageReferences">List of package references in the project from which packages to be reinstalled are determined</param>
         /// <returns>List of package identities to be reinstalled</returns>
-        public static List<PackageIdentity> GetPackagesToBeReinstalled(NuGetFramework projectFramework, IEnumerable<Packaging.PackageReference> packageReferences)
+        public static async Task<List<PackageIdentity>> GetPackagesToBeReinstalledAsync(NuGetFramework projectFramework, IEnumerable<Packaging.PackageReference> packageReferences)
         {
             Debug.Assert(projectFramework != null);
             Debug.Assert(packageReferences != null);
 
             var packagesToBeReinstalled = new List<PackageIdentity>();
-            var sourceRepositoryProvider = ServiceLocator.GetInstance<ISourceRepositoryProvider>();
-            var solutionManager = ServiceLocator.GetInstance<ISolutionManager>();
-            var settings = ServiceLocator.GetInstance<Configuration.ISettings>();
-            var deleteOnRestartManager = ServiceLocator.GetInstance<IDeleteOnRestartManager>();
+            var sourceRepositoryProvider = await ServiceLocator.GetComponentModelServiceAsync<ISourceRepositoryProvider>();
+            var solutionManager = await ServiceLocator.GetComponentModelServiceAsync<ISolutionManager>();
+            var settings = await ServiceLocator.GetComponentModelServiceAsync<Configuration.ISettings>();
+            var deleteOnRestartManager = await ServiceLocator.GetComponentModelServiceAsync<IDeleteOnRestartManager>();
             var packageManager = new NuGetPackageManager(
                 sourceRepositoryProvider,
                 settings,

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Utility/SettingsHelper.cs

@@ -24,7 +24,7 @@ public static class SettingsHelper
         /// </param>
         public static void Set(string property, string value)
         {
-            var settings = ServiceLocator.GetInstance<Configuration.ISettings>();
+            var settings = ServiceLocator.GetComponentModelService<ISettings>();
             var packageRestoreConsent = new PackageRestoreConsent(settings);
             if (string.Equals(property, "PackageRestoreConsentGranted", StringComparison.OrdinalIgnoreCase))
             {

src/NuGet.Clients/NuGet.Tools/NuGetBrokeredServiceFactory.cs

@@ -203,11 +203,11 @@ private async ValueTask<object> CreatePackageFileServiceAsync(
         }
         private async Task InitializeAsync()
         {
-            _lazySettings = new AsyncLazy<ISettings>(ServiceLocator.GetInstanceAsync<ISettings>, ThreadHelper.JoinableTaskFactory);
-            _lazySolutionManager = new AsyncLazy<IVsSolutionManager>(ServiceLocator.GetInstanceAsync<IVsSolutionManager>, ThreadHelper.JoinableTaskFactory);
+            _lazySettings = new AsyncLazy<ISettings>(ServiceLocator.GetComponentModelServiceAsync<ISettings>, ThreadHelper.JoinableTaskFactory);
+            _lazySolutionManager = new AsyncLazy<IVsSolutionManager>(ServiceLocator.GetComponentModelServiceAsync<IVsSolutionManager>, ThreadHelper.JoinableTaskFactory);
             _projectManagerServiceSharedState = new NuGetProjectManagerServiceState();
             _sharedServiceState = await SharedServiceState.CreateAsync(CancellationToken.None);
-            _lazyTelemetryProvider = new AsyncLazy<INuGetTelemetryProvider>(ServiceLocator.GetInstanceAsync<INuGetTelemetryProvider>, ThreadHelper.JoinableTaskFactory);
+            _lazyTelemetryProvider = new AsyncLazy<INuGetTelemetryProvider>(ServiceLocator.GetComponentModelServiceAsync<INuGetTelemetryProvider>, ThreadHelper.JoinableTaskFactory);
         }
     }
 }