finish

dotnet · RikkiGibson · May 8, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024
commit 25d532429688430d6aecd5b4c1545f4f0a65746c
@@ -125,7 +125,7 @@ public async Task TestPreviewServices()
             using var previewWorkspace = new PreviewWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
             var persistentService = previewWorkspace.Services.SolutionServices.GetPersistentStorageService();
 
-            await using var storage = await persistentService.GetStorageAsync(SolutionKey.ToSolutionKey(previewWorkspace.CurrentSolution), CancellationToken.None);
+            var storage = await persistentService.GetStorageAsync(SolutionKey.ToSolutionKey(previewWorkspace.CurrentSolution), CancellationToken.None);
             Assert.IsType<NoOpPersistentStorage>(storage);
         }
 

@@ -61,10 +61,9 @@ public void GlobalSetup()
     </Project>
 </Workspace>");
 
-            var connectionPoolService = _workspace.ExportProvider.GetExportedValue<SQLiteConnectionPoolService>();
             var asyncListener = _workspace.ExportProvider.GetExportedValue<IAsynchronousOperationListenerProvider>().GetListener(FeatureAttribute.PersistentStorage);
 
-            _storageService = new SQLitePersistentStorageService(connectionPoolService, new StorageConfiguration(), asyncListener);
+            _storageService = new SQLitePersistentStorageService(new StorageConfiguration(), asyncListener);
 
             var solution = _workspace.CurrentSolution;
             _storage = _storageService.GetStorageAsync(SolutionKey.ToSolutionKey(solution), CancellationToken.None).AsTask().GetAwaiter().GetResult();

@@ -24,7 +24,6 @@ public class SQLiteV2PersistentStorageTests : AbstractPersistentStorageTests
     {
         internal override AbstractPersistentStorageService GetStorageService(IMefHostExportProvider exportProvider, IPersistentStorageConfiguration configuration, IPersistentStorageFaultInjector? faultInjector, string relativePathBase)
             => new SQLitePersistentStorageService(
-                exportProvider.GetExports<SQLiteConnectionPoolService>().Single().Value,
                 configuration,
                 exportProvider.GetExports<IAsynchronousOperationListenerProvider>().Single().Value.GetListener(FeatureAttribute.PersistentStorage),
                 faultInjector);

diff --git a/src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs b/src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs
            ? throw new InvalidOperationException("Database was not supported")
            : new NoOpPersistentStorage(solutionKey);

    public void Dispose()
    {
    }

    public ValueTask DisposeAsync()
        => ValueTaskFactory.CompletedTask;

    public Task<bool> ChecksumMatchesAsync(string name, Checksum checksum, CancellationToken cancellationToken)
	? throw new InvalidOperationException("Database was not supported")
	: new NoOpPersistentStorage(solutionKey);

	public void Dispose()
Check failure on line 23 in src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs Azure Pipelines / roslyn-CI (Correctness Correctness_Analyzers) src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs#L23 `src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs(23,17): error CA1822: (NETCORE_ENGINEERING_TELEMETRY=Build) Member 'Dispose' does not access instance data and can be marked as static (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822)` Check failure on line 23 in src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs Azure Pipelines / roslyn-CI (Correctness Correctness_Analyzers) src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs#L23 `src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs(23,17): error CA1822: (NETCORE_ENGINEERING_TELEMETRY=Build) Member 'Dispose' does not access instance data and can be marked as static (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822)` Check failure on line 23 in src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs Azure Pipelines / roslyn-CI (Correctness Correctness_Analyzers) src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs#L23 `src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs(23,17): error CA1822: (NETCORE_ENGINEERING_TELEMETRY=Build) Member 'Dispose' does not access instance data and can be marked as static (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822)`
	{
	}

	public ValueTask DisposeAsync()
Check failure on line 27 in src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs Azure Pipelines / roslyn-CI (Correctness Correctness_Analyzers) src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs#L27 `src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs(27,22): error CA1822: (NETCORE_ENGINEERING_TELEMETRY=Build) Member 'DisposeAsync' does not access instance data and can be marked as static (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822)` Check failure on line 27 in src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs Azure Pipelines / roslyn-CI (Correctness Correctness_Analyzers) src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs#L27 `src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/NoOpPersistentStorage.cs(27,22): error CA1822: (NETCORE_ENGINEERING_TELEMETRY=Build) Member 'DisposeAsync' does not access instance data and can be marked as static (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822)`
	=> ValueTaskFactory.CompletedTask;

	public Task<bool> ChecksumMatchesAsync(string name, Checksum checksum, CancellationToken cancellationToken)