From 6f3b54f3acd74993f7df6bd29126e548e64907c6 Mon Sep 17 00:00:00 2001 From: Heejae Chang Date: Tue, 20 Jun 2017 14:39:34 -0700 Subject: [PATCH] renamed SolutionSynchronizationService -> RemotableDataService --- .../EngineV2/DiagnosticAnalyzerExecutor.cs | 2 +- ...tServiceFactory.RemoteHostClientService.cs | 4 +-- .../Next/Remote/RemotableDataJsonRpcEx.cs | 4 +-- .../RemoteHostClientServiceFactoryTests.cs | 2 +- ...alStudioDiagnosticAnalyzerExecutorTests.cs | 2 +- .../Core/Portable/Execution/CustomAsset.cs | 2 +- .../Portable/Execution/CustomAssetBuilder.cs | 2 +- .../ISolutionSynchronizationService.cs | 2 +- .../Core/Portable/Execution/RemotableData.cs | 2 +- .../SolutionSynchronizationService.cs | 6 ++-- .../Remote/RemoteHostClientExtensions.cs | 2 +- .../CoreTest/Execution/Extensions.cs | 12 +++---- .../SnapshotSerializationTestBase.cs | 32 ++++++++--------- .../Execution/SnapshotSerializationTests.cs | 34 +++++++++---------- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticAnalyzerExecutor.cs b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticAnalyzerExecutor.cs index 1aaa43e1cff..67d639c91ab 100644 --- a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticAnalyzerExecutor.cs +++ b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticAnalyzerExecutor.cs @@ -120,7 +120,7 @@ public AnalyzerExecutor(AbstractHostDiagnosticUpdateSource hostDiagnosticUpdateS RemoteHostClient client, CompilationWithAnalyzers analyzerDriver, Project project, bool forcedAnalysis, CancellationToken cancellationToken) { var solution = project.Solution; - var snapshotService = solution.Workspace.Services.GetService(); + var snapshotService = solution.Workspace.Services.GetService(); // TODO: this should be moved out var analyzerMap = CreateAnalyzerMap(analyzerDriver.Analyzers.Where(a => !a.IsOpenFileOnly(project.Solution.Workspace))); diff --git a/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.RemoteHostClientService.cs b/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.RemoteHostClientService.cs index 9cdaaab9c03..951ad96b9da 100644 --- a/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.RemoteHostClientService.cs +++ b/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.RemoteHostClientService.cs @@ -186,7 +186,7 @@ private Checksum[] AddGlobalAssets(CancellationToken cancellationToken) using (Logger.LogBlock(FunctionId.RemoteHostClientService_AddGlobalAssetsAsync, cancellationToken)) { - var snapshotService = _workspace.Services.GetService(); + var snapshotService = _workspace.Services.GetService(); var assetBuilder = new CustomAssetBuilder(_workspace); foreach (var reference in _analyzerService.GetHostAnalyzerReferences()) @@ -205,7 +205,7 @@ private void RemoveGlobalAssets() { using (Logger.LogBlock(FunctionId.RemoteHostClientService_RemoveGlobalAssets, CancellationToken.None)) { - var snapshotService = _workspace.Services.GetService(); + var snapshotService = _workspace.Services.GetService(); foreach (var reference in _analyzerService.GetHostAnalyzerReferences()) { diff --git a/src/VisualStudio/Core/Next/Remote/RemotableDataJsonRpcEx.cs b/src/VisualStudio/Core/Next/Remote/RemotableDataJsonRpcEx.cs index 1ef7db6da19..80816ab07e4 100644 --- a/src/VisualStudio/Core/Next/Remote/RemotableDataJsonRpcEx.cs +++ b/src/VisualStudio/Core/Next/Remote/RemotableDataJsonRpcEx.cs @@ -24,7 +24,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Remote /// internal class RemotableDataJsonRpcEx : JsonRpcEx { - private readonly ISolutionSynchronizationService _remotableDataService; + private readonly IRemotableDataService _remotableDataService; private readonly CancellationTokenSource _source; /// @@ -39,7 +39,7 @@ public RemotableDataJsonRpcEx(Microsoft.CodeAnalysis.Workspace workspace, Stream _gate = new object(); _count = 1; - _remotableDataService = workspace.Services.GetService(); + _remotableDataService = workspace.Services.GetService(); // cancellation will be removed once I get to cancellation refactoring _source = new CancellationTokenSource(); diff --git a/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs b/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs index 73e250db61a..7ace5d8ea6a 100644 --- a/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs +++ b/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs @@ -63,7 +63,7 @@ public async Task GlobalAssets() // make sure client is ready var client = await service.TryGetRemoteHostClientAsync(CancellationToken.None); - var checksumService = workspace.Services.GetService(); + var checksumService = workspace.Services.GetService(); var asset = checksumService.GetGlobalAsset(analyzerReference, CancellationToken.None); Assert.NotNull(asset); diff --git a/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs b/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs index e224af17e05..cb5306cc544 100644 --- a/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs @@ -139,7 +139,7 @@ void Method() var analyzerReference = new AnalyzerFileReference(analyzerType.Assembly.Location, new TestAnalyzerAssemblyLoader()); // add host analyzer as global assets - var snapshotService = workspace.Services.GetService(); + var snapshotService = workspace.Services.GetService(); var assetBuilder = new CustomAssetBuilder(workspace); var asset = assetBuilder.Build(analyzerReference, CancellationToken.None); diff --git a/src/Workspaces/Core/Portable/Execution/CustomAsset.cs b/src/Workspaces/Core/Portable/Execution/CustomAsset.cs index b3f21afc39f..7b86a34eae1 100644 --- a/src/Workspaces/Core/Portable/Execution/CustomAsset.cs +++ b/src/Workspaces/Core/Portable/Execution/CustomAsset.cs @@ -10,7 +10,7 @@ namespace Microsoft.CodeAnalysis.Execution { /// - /// Asset that is not part of solution, but want to participate in + /// Asset that is not part of solution, but want to participate in /// internal abstract class CustomAsset : RemotableData { diff --git a/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs b/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs index 8e8f42ac0a2..eac7b36cb68 100644 --- a/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs +++ b/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs @@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Execution { /// - /// builder to create custom asset which is not part of solution but want to participate in + /// builder to create custom asset which is not part of solution but want to participate in /// internal class CustomAssetBuilder { diff --git a/src/Workspaces/Core/Portable/Execution/ISolutionSynchronizationService.cs b/src/Workspaces/Core/Portable/Execution/ISolutionSynchronizationService.cs index b99aad78282..2436386cb95 100644 --- a/src/Workspaces/Core/Portable/Execution/ISolutionSynchronizationService.cs +++ b/src/Workspaces/Core/Portable/Execution/ISolutionSynchronizationService.cs @@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.Execution /// a service that lets one to create that can be used to pin solution /// while working on remote host /// - internal interface ISolutionSynchronizationService : IWorkspaceService + internal interface IRemotableDataService : IWorkspaceService { /// /// Add global which stays alive while host is alive. diff --git a/src/Workspaces/Core/Portable/Execution/RemotableData.cs b/src/Workspaces/Core/Portable/Execution/RemotableData.cs index 350cb215293..db68f80467a 100644 --- a/src/Workspaces/Core/Portable/Execution/RemotableData.cs +++ b/src/Workspaces/Core/Portable/Execution/RemotableData.cs @@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis.Execution { /// - /// Base for object that will use framework to synchronize data to remote host + /// Base for object that will use framework to synchronize data to remote host /// internal abstract partial class RemotableData { diff --git a/src/Workspaces/Core/Portable/Execution/SolutionSynchronizationService.cs b/src/Workspaces/Core/Portable/Execution/SolutionSynchronizationService.cs index 12d58d75364..48b7dc24e48 100644 --- a/src/Workspaces/Core/Portable/Execution/SolutionSynchronizationService.cs +++ b/src/Workspaces/Core/Portable/Execution/SolutionSynchronizationService.cs @@ -11,8 +11,8 @@ namespace Microsoft.CodeAnalysis.Execution { - [ExportWorkspaceServiceFactory(typeof(ISolutionSynchronizationService)), Shared] - internal class SolutionSynchronizationServiceFactory : IWorkspaceServiceFactory + [ExportWorkspaceServiceFactory(typeof(IRemotableDataService)), Shared] + internal class RemotableDataServiceFactory : IWorkspaceServiceFactory { private readonly AssetStorages _assetStorages = new AssetStorages(); @@ -21,7 +21,7 @@ public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices) return new Service(workspaceServices, _assetStorages); } - internal class Service : ISolutionSynchronizationService + internal class Service : IRemotableDataService { private readonly HostWorkspaceServices _workspaceServices; private readonly AssetStorages _assetStorages; diff --git a/src/Workspaces/Core/Portable/Remote/RemoteHostClientExtensions.cs b/src/Workspaces/Core/Portable/Remote/RemoteHostClientExtensions.cs index 739a124ad58..c2f245c1855 100644 --- a/src/Workspaces/Core/Portable/Remote/RemoteHostClientExtensions.cs +++ b/src/Workspaces/Core/Portable/Remote/RemoteHostClientExtensions.cs @@ -238,7 +238,7 @@ public static async Task GetPinnedScopeAsync(this Solu { Contract.ThrowIfNull(solution); - var service = solution.Workspace.Services.GetService(); + var service = solution.Workspace.Services.GetService(); return await service.CreatePinnedRemotableDataScopeAsync(solution, cancellationToken).ConfigureAwait(false); } diff --git a/src/Workspaces/CoreTest/Execution/Extensions.cs b/src/Workspaces/CoreTest/Execution/Extensions.cs index 1255c21fbc7..a8c18bce150 100644 --- a/src/Workspaces/CoreTest/Execution/Extensions.cs +++ b/src/Workspaces/CoreTest/Execution/Extensions.cs @@ -15,9 +15,9 @@ namespace Microsoft.CodeAnalysis.UnitTests.Execution { internal static class Extensions { - public static async Task GetValueAsync(this ISolutionSynchronizationService service, Checksum checksum) + public static async Task GetValueAsync(this IRemotableDataService service, Checksum checksum) { - var syncService = (SolutionSynchronizationServiceFactory.Service)service; + var syncService = (RemotableDataServiceFactory.Service)service; var syncObject = syncService.GetRemotableData_TestOnly(checksum, CancellationToken.None); using (var stream = SerializableBytes.CreateWritableStream()) @@ -36,17 +36,17 @@ public static async Task GetValueAsync(this ISolutionSynchronizationServic } } - public static ChecksumObjectCollection ToProjectObjects(this ProjectChecksumCollection collection, ISolutionSynchronizationService service) + public static ChecksumObjectCollection ToProjectObjects(this ProjectChecksumCollection collection, IRemotableDataService service) { return new ChecksumObjectCollection(service, collection); } - public static ChecksumObjectCollection ToDocumentObjects(this DocumentChecksumCollection collection, ISolutionSynchronizationService service) + public static ChecksumObjectCollection ToDocumentObjects(this DocumentChecksumCollection collection, IRemotableDataService service) { return new ChecksumObjectCollection(service, collection); } - public static ChecksumObjectCollection ToDocumentObjects(this TextDocumentChecksumCollection collection, ISolutionSynchronizationService service) + public static ChecksumObjectCollection ToDocumentObjects(this TextDocumentChecksumCollection collection, IRemotableDataService service) { return new ChecksumObjectCollection(service, collection); } @@ -59,7 +59,7 @@ internal class ChecksumObjectCollection : RemotableData, IEnumerable where { public ImmutableArray Children { get; } - public ChecksumObjectCollection(ISolutionSynchronizationService service, ChecksumCollection collection) : base(collection.Checksum, collection.GetWellKnownSynchronizationKind()) + public ChecksumObjectCollection(IRemotableDataService service, ChecksumCollection collection) : base(collection.Checksum, collection.GetWellKnownSynchronizationKind()) { // using .Result here since we don't want to convert all calls to this to async. // and none of ChecksumWithChildren actually use async diff --git a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs index 878c6bc0a1e..5d863160cde 100644 --- a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs +++ b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs @@ -36,7 +36,7 @@ internal static Solution CreateFullSolution(HostServices hostServices = null) return textDocument1.Project.Solution; } - internal static async Task VerifyAssetAsync(ISolutionSynchronizationService service, SolutionStateChecksums solutionObject) + internal static async Task VerifyAssetAsync(IRemotableDataService service, SolutionStateChecksums solutionObject) { await VerifyAssetSerializationAsync( service, solutionObject.Info, WellKnownSynchronizationKind.SolutionAttributes, @@ -49,7 +49,7 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv } } - internal static async Task VerifyAssetAsync(ISolutionSynchronizationService service, ProjectStateChecksums projectObject) + internal static async Task VerifyAssetAsync(IRemotableDataService service, ProjectStateChecksums projectObject) { var info = await VerifyAssetSerializationAsync( service, projectObject.Info, WellKnownSynchronizationKind.ProjectAttributes, @@ -97,7 +97,7 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv } } - internal static async Task VerifyAssetAsync(ISolutionSynchronizationService service, DocumentStateChecksums documentObject) + internal static async Task VerifyAssetAsync(IRemotableDataService service, DocumentStateChecksums documentObject) { var info = await VerifyAssetSerializationAsync( service, documentObject.Info, WellKnownSynchronizationKind.DocumentAttributes, @@ -109,13 +109,13 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv } internal static async Task VerifyAssetSerializationAsync( - ISolutionSynchronizationService service, + IRemotableDataService service, Checksum checksum, WellKnownSynchronizationKind kind, Func assetGetter) { // re-create asset from object - var syncService = (SolutionSynchronizationServiceFactory.Service)service; + var syncService = (RemotableDataServiceFactory.Service)service; var syncObject = syncService.GetRemotableData_TestOnly(checksum, CancellationToken.None); var recoveredValue = await service.GetValueAsync(checksum); @@ -127,7 +127,7 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv return recoveredValue; } - internal static async Task VerifySolutionStateSerializationAsync(ISolutionSynchronizationService service, Solution solution, Checksum solutionChecksum) + internal static async Task VerifySolutionStateSerializationAsync(IRemotableDataService service, Solution solution, Checksum solutionChecksum) { var solutionObjectFromSyncObject = await service.GetValueAsync(solutionChecksum); Assert.True(solution.State.TryGetStateChecksums(out var solutionObjectFromSolution)); @@ -135,14 +135,14 @@ internal static async Task VerifySolutionStateSerializationAsync(ISolutionSynchr SolutionStateEqual(service, solutionObjectFromSolution, solutionObjectFromSyncObject); } - internal static void SolutionStateEqual(ISolutionSynchronizationService service, SolutionStateChecksums solutionObject1, SolutionStateChecksums solutionObject2) + internal static void SolutionStateEqual(IRemotableDataService service, SolutionStateChecksums solutionObject1, SolutionStateChecksums solutionObject2) { ChecksumWithChildrenEqual(solutionObject1, solutionObject2); ProjectStatesEqual(service, solutionObject1.Projects.ToProjectObjects(service), solutionObject2.Projects.ToProjectObjects(service)); } - internal static void ProjectStateEqual(ISolutionSynchronizationService service, ProjectStateChecksums projectObjects1, ProjectStateChecksums projectObjects2) + internal static void ProjectStateEqual(IRemotableDataService service, ProjectStateChecksums projectObjects1, ProjectStateChecksums projectObjects2) { ChecksumWithChildrenEqual(projectObjects1, projectObjects2); @@ -150,7 +150,7 @@ internal static void ProjectStateEqual(ISolutionSynchronizationService service, ChecksumWithChildrenEqual(projectObjects1.AdditionalDocuments.ToDocumentObjects(service), projectObjects2.AdditionalDocuments.ToDocumentObjects(service)); } - internal static void ProjectStatesEqual(ISolutionSynchronizationService service, ChecksumObjectCollection projectObjects1, ChecksumObjectCollection projectObjects2) + internal static void ProjectStatesEqual(IRemotableDataService service, ChecksumObjectCollection projectObjects1, ChecksumObjectCollection projectObjects2) { SynchronizationObjectEqual(projectObjects1, projectObjects2); @@ -197,7 +197,7 @@ internal static void ChecksumWithChildrenEqual(ChecksumWithChildren checksums1, } internal static void VerifySnapshotInService( - ISolutionSynchronizationService snapshotService, + IRemotableDataService snapshotService, ProjectStateChecksums projectObject, int expectedDocumentCount, int expectedProjectReferenceCount, @@ -219,7 +219,7 @@ internal static void ChecksumWithChildrenEqual(ChecksumWithChildren checksums1, VerifyCollectionInService(snapshotService, projectObject.AdditionalDocuments.ToDocumentObjects(snapshotService), expectedAdditionalDocumentCount); } - internal static void VerifyCollectionInService(ISolutionSynchronizationService snapshotService, ChecksumCollection checksums, int expectedCount, WellKnownSynchronizationKind expectedItemKind) + internal static void VerifyCollectionInService(IRemotableDataService snapshotService, ChecksumCollection checksums, int expectedCount, WellKnownSynchronizationKind expectedItemKind) { VerifyChecksumInService(snapshotService, checksums.Checksum, checksums.GetWellKnownSynchronizationKind()); Assert.Equal(checksums.Count, expectedCount); @@ -230,7 +230,7 @@ internal static void VerifyCollectionInService(ISolutionSynchronizationService s } } - internal static void VerifyCollectionInService(ISolutionSynchronizationService snapshotService, ChecksumObjectCollection documents, int expectedCount) + internal static void VerifyCollectionInService(IRemotableDataService snapshotService, ChecksumObjectCollection documents, int expectedCount) { VerifySynchronizationObjectInService(snapshotService, documents); Assert.Equal(documents.Count, expectedCount); @@ -241,22 +241,22 @@ internal static void VerifyCollectionInService(ISolutionSynchronizationService s } } - internal static void VerifySnapshotInService(ISolutionSynchronizationService snapshotService, DocumentStateChecksums documentObject) + internal static void VerifySnapshotInService(IRemotableDataService snapshotService, DocumentStateChecksums documentObject) { VerifyChecksumInService(snapshotService, documentObject.Checksum, documentObject.GetWellKnownSynchronizationKind()); VerifyChecksumInService(snapshotService, documentObject.Info, WellKnownSynchronizationKind.DocumentAttributes); VerifyChecksumInService(snapshotService, documentObject.Text, WellKnownSynchronizationKind.SourceText); } - internal static void VerifySynchronizationObjectInService(ISolutionSynchronizationService snapshotService, T syncObject) where T : RemotableData + internal static void VerifySynchronizationObjectInService(IRemotableDataService snapshotService, T syncObject) where T : RemotableData { VerifyChecksumInService(snapshotService, syncObject.Checksum, syncObject.Kind); } - internal static void VerifyChecksumInService(ISolutionSynchronizationService snapshotService, Checksum checksum, WellKnownSynchronizationKind kind) + internal static void VerifyChecksumInService(IRemotableDataService snapshotService, Checksum checksum, WellKnownSynchronizationKind kind) { Assert.NotNull(checksum); - var service = (SolutionSynchronizationServiceFactory.Service)snapshotService; + var service = (RemotableDataServiceFactory.Service)snapshotService; var otherObject = service.GetRemotableData_TestOnly(checksum, CancellationToken.None); ChecksumEqual(checksum, kind, otherObject.Checksum, otherObject.Kind); diff --git a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs index d882fc86c07..d3e1948c695 100644 --- a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs +++ b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs @@ -33,7 +33,7 @@ public async Task CreateSolutionSnapshotId_Empty() { var solution = new AdhocWorkspace().CurrentSolution; - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { var checksum = snapshot.SolutionChecksum; @@ -56,7 +56,7 @@ public async Task CreateSolutionSnapshotId_Empty_Serialization() { var solution = new AdhocWorkspace().CurrentSolution; - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { await VerifySolutionStateSerializationAsync(snapshotService, solution, snapshot.SolutionChecksum).ConfigureAwait(false); @@ -68,7 +68,7 @@ public async Task CreateSolutionSnapshotId_Project() { var project = new AdhocWorkspace().CurrentSolution.AddProject("Project", "Project.dll", LanguageNames.CSharp); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(project.Solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(project.Solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(project.Solution, CancellationToken.None).ConfigureAwait(false)) { var checksum = snapshot.SolutionChecksum; @@ -93,7 +93,7 @@ public async Task CreateSolutionSnapshotId_Project_Serialization() { var project = new AdhocWorkspace().CurrentSolution.AddProject("Project", "Project.dll", LanguageNames.CSharp); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(project.Solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(project.Solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(project.Solution, CancellationToken.None).ConfigureAwait(false)) { await VerifySolutionStateSerializationAsync(snapshotService, project.Solution, snapshot.SolutionChecksum).ConfigureAwait(false); @@ -107,7 +107,7 @@ public async Task CreateSolutionSnapshotId() var document = new AdhocWorkspace().CurrentSolution.AddProject("Project", "Project.dll", LanguageNames.CSharp).AddDocument("Document", SourceText.From(code)); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(document.Project.Solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(document.Project.Solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(document.Project.Solution, CancellationToken.None).ConfigureAwait(false)) { var syncObject = snapshot.GetRemotableData(snapshot.SolutionChecksum, CancellationToken.None); @@ -129,7 +129,7 @@ public async Task CreateSolutionSnapshotId_Serialization() var document = new AdhocWorkspace().CurrentSolution.AddProject("Project", "Project.dll", LanguageNames.CSharp).AddDocument("Document", SourceText.From(code)); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(document.Project.Solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(document.Project.Solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(document.Project.Solution, CancellationToken.None).ConfigureAwait(false)) { await VerifySolutionStateSerializationAsync(snapshotService, document.Project.Solution, snapshot.SolutionChecksum).ConfigureAwait(false); @@ -144,7 +144,7 @@ public async Task CreateSolutionSnapshotId_Full() var firstProjectChecksum = await solution.GetProject(solution.ProjectIds[0]).State.GetChecksumAsync(CancellationToken.None); var secondProjectChecksum = await solution.GetProject(solution.ProjectIds[1]).State.GetChecksumAsync(CancellationToken.None); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { var syncObject = snapshot.GetRemotableData(snapshot.SolutionChecksum, CancellationToken.None); @@ -167,7 +167,7 @@ public async Task CreateSolutionSnapshotId_Full_Serialization() { var solution = CreateFullSolution(); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { await VerifySolutionStateSerializationAsync(snapshotService, solution, snapshot.SolutionChecksum).ConfigureAwait(false); @@ -179,7 +179,7 @@ public async Task CreateSolutionSnapshotId_Full_Asset_Serialization() { var solution = CreateFullSolution(); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { var solutionObject = await snapshotService.GetValueAsync(snapshot.SolutionChecksum); @@ -195,7 +195,7 @@ public async Task CreateSolutionSnapshotId_Full_Asset_Serialization_Desktop() var solution = CreateFullSolution(hostServices); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { var solutionObject = await snapshotService.GetValueAsync(snapshot.SolutionChecksum); @@ -213,7 +213,7 @@ public async Task CreateSolutionSnapshotId_Duplicate() SolutionStateChecksums solutionId1; SolutionStateChecksums solutionId2; - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var snapshot1 = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false)) { solutionId1 = await snapshotService.GetValueAsync(snapshot1.SolutionChecksum).ConfigureAwait(false); @@ -250,7 +250,7 @@ public async Task Workspace_RoundTrip_Test() { var solution = CreateFullSolution(); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; var snapshot1 = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false); // recover solution from given snapshot @@ -292,7 +292,7 @@ public async Task Workspace_RoundTrip_Test_Desktop() var solution = CreateFullSolution(hostServices); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; var snapshot1 = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None).ConfigureAwait(false); // recover solution from given snapshot @@ -455,7 +455,7 @@ public async Task SnapshotWithMissingReferencesTest() project = project.AddMetadataReference(metadata); project = project.AddAnalyzerReference(analyzer); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(project.Solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(project.Solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(project.Solution, CancellationToken.None).ConfigureAwait(false)) { // this shouldn't throw @@ -470,7 +470,7 @@ public async Task UnknownLanguageTest() var project = new AdhocWorkspace(hostServices).CurrentSolution.AddProject("Project", "Project.dll", NullLanguageService.TestLanguage); - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(project.Solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(project.Solution.Workspace.Services) as IRemotableDataService; using (var snapshot = await snapshotService.CreatePinnedRemotableDataScopeAsync(project.Solution, CancellationToken.None).ConfigureAwait(false)) { // this shouldn't throw @@ -601,7 +601,7 @@ private async Task GetXmlDocumentAsync(HostServices services) .AddMetadataReference(MetadataReference.CreateFromFile(tempCorlib.Path)) .Solution; - var snapshotService = (new SolutionSynchronizationServiceFactory()).CreateService(solution.Workspace.Services) as ISolutionSynchronizationService; + var snapshotService = (new RemotableDataServiceFactory()).CreateService(solution.Workspace.Services) as IRemotableDataService; using (var scope = await snapshotService.CreatePinnedRemotableDataScopeAsync(solution, CancellationToken.None)) { // recover solution from given snapshot @@ -642,7 +642,7 @@ private static async Task VerifyOptionSetsAsync(Workspace workspace, string lang } } - private async Task GetSolutionAsync(ISolutionSynchronizationService service, PinnedRemotableDataScope syncScope) + private async Task GetSolutionAsync(IRemotableDataService service, PinnedRemotableDataScope syncScope) { var workspace = new AdhocWorkspace(); -- GitLab