Merge pull request #13622 from CyrusNajmabadi/persistenceLayer

Export persistence service at appropriate layer.

src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.IncrementalAnalyzerProcessor.cs

@@ -98,6 +98,7 @@ private IDiagnosticAnalyzerService GetDiagnosticAnalyzerService(IEnumerable<Lazy
                 {
                     // Sort list so BaseDiagnosticIncrementalAnalyzers (if any) come first.  OrderBy orders 'false' keys before 'true'.
                     return providers.Select(p => p.Value.CreateIncrementalAnalyzer(registration.Workspace))
+                                    .WhereNotNull()
                                     .OrderBy(a => !(a is BaseDiagnosticIncrementalAnalyzer))
                                     .ToImmutableArray();
                 }
@@ -194,6 +195,11 @@ private void ResetLogAggregator()
                         }
 
                         var local = analyzer;
+                        if (local == null)
+                        {
+                            return;
+                        }
+
                         await GetOrDefaultAsync(value, async (v, c) =>
                         {
                             await runnerAsync(local, v, c).ConfigureAwait(false);

src/Workspaces/Core/Desktop/Workspace/Storage/PersistenceServiceFactory.cs

@@ -9,7 +9,7 @@
 
 namespace Microsoft.CodeAnalysis.Storage
 {
-    [ExportWorkspaceServiceFactory(typeof(IPersistentStorageService), ServiceLayer.Host), Shared]
+    [ExportWorkspaceServiceFactory(typeof(IPersistentStorageService), ServiceLayer.Desktop), Shared]
     internal class PersistenceStorageServiceFactory : IWorkspaceServiceFactory
     {
         private readonly SolutionSizeTracker _solutionSizeTracker;