Test: dispose DirectoryService

src/Sign.Cli/AzureKeyVaultCommand.cs

@@ -7,7 +7,6 @@
 using System.CommandLine.IO;
 using Azure.Core;
 using Azure.Security.KeyVault.Certificates;
-using Azure.Security.KeyVault.Keys;
 using Azure.Security.KeyVault.Keys.Cryptography;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.DependencyInjection;

src/Sign.Core/DataFormatSigners/ClickOnceSigner.cs

@@ -143,7 +143,7 @@ await Parallel.ForEachAsync(files, _parallelOptions, async (file, state) =>
                     if (string.IsNullOrEmpty(options.PublisherName))
                     {
                         string publisherName = certificate.SubjectName.Name;
- 
+
                         // get the DN. it may be quoted
                         publisherParam = $@"-pub ""{publisherName.Replace("\"", "")}""";
                     }

src/Sign.Core/DataFormatSigners/SignOptions.cs

@@ -42,7 +42,7 @@ internal SignOptions(
         }
 
         internal SignOptions(HashAlgorithmName fileHashAlgorithm, Uri timestampService)
-            : this(applicationName: null, publisherName: null, description: null, descriptionUrl: null, 
+            : this(applicationName: null, publisherName: null, description: null, descriptionUrl: null,
                   fileHashAlgorithm, HashAlgorithmName.SHA256, timestampService, matcher: null,
                   antiMatcher: null)
         {

test/Sign.Cli.Test/SignCommandTests.Globbing.cs

@@ -14,6 +14,7 @@ public partial class SignCommandTests
     {
         public sealed class GlobbingTests : IDisposable
         {
+            private readonly DirectoryService _directoryService;
             private readonly Parser _parser;
             private readonly SignerSpy _signerSpy;
             private readonly TemporaryDirectory _temporaryDirectory;
@@ -33,7 +34,8 @@ public GlobbingTests()
 
                 _parser = Program.CreateParser(serviceProviderFactory);
 
-                _temporaryDirectory = new TemporaryDirectory(new DirectoryService(Mock.Of<ILogger<IDirectoryService>>()));
+                _directoryService = new DirectoryService(Mock.Of<ILogger<IDirectoryService>>());
+                _temporaryDirectory = new TemporaryDirectory(_directoryService);
 
                 CreateFileSystemInfos(
                     _temporaryDirectory,
@@ -52,6 +54,7 @@ public GlobbingTests()
             public void Dispose()
             {
                 _temporaryDirectory.Dispose();
+                _directoryService.Dispose();
 
                 GC.SuppressFinalize(this);
             }

test/Sign.Core.Test/DataFormatSigners/AggregatingSignerTests.Containers.cs

@@ -345,7 +345,7 @@ public async Task SignAsync_WhenFileIsZipContainerWithNestedContentAndContainers
         [Fact]
         public async Task SignAsync_WhenFileIsZipContainerAndGlobAndAntiGlobPatternsAreUsed_SignsOnlyMatchingFiles()
         {
-            const string fileListContents = 
+            const string fileListContents =
 @"**/*.dll
 **/*.exe
 !**/*.txt

test/Sign.Core.Test/DataFormatSigners/AzureSignToolSignerTests.cs

@@ -12,24 +12,30 @@
 namespace Sign.Core.Test
 {
     [Collection(SigningTestsCollection.Name)]
-    public class AzureSignToolSignerTests
+    public sealed class AzureSignToolSignerTests : IDisposable
     {
         private readonly TrustedCertificateFixture _certificateFixture;
-        private readonly DirectoryService _directoryService = new(Mock.Of<ILogger<IDirectoryService>>());
+        private readonly DirectoryService _directoryService;
         private readonly AzureSignToolSigner _signer;
 
         public AzureSignToolSignerTests(TrustedCertificateFixture certificateFixture)
         {
             ArgumentNullException.ThrowIfNull(certificateFixture, nameof(certificateFixture));
 
             _certificateFixture = certificateFixture;
+            _directoryService = new(Mock.Of<ILogger<IDirectoryService>>());
             _signer = new AzureSignToolSigner(
                 Mock.Of<IToolConfigurationProvider>(),
                 Mock.Of<ISignatureAlgorithmProvider>(),
                 Mock.Of<ICertificateProvider>(),
                 Mock.Of<ILogger<IDataFormatSigner>>());
         }
 
+        public void Dispose()
+        {
+            _directoryService.Dispose();
+        }
+
         [Fact]
         public void CanSign_WhenFileIsNull_Throws()
         {

test/Sign.Core.Test/DataFormatSigners/ClickOnceSignerTests.cs

@@ -12,11 +12,12 @@ namespace Sign.Core.Test
 {
     public sealed class ClickOnceSignerTests : IDisposable
     {
-        private readonly DirectoryService _directoryService = new(Mock.Of<ILogger<IDirectoryService>>());
+        private readonly DirectoryService _directoryService;
         private readonly ClickOnceSigner _signer;
 
         public ClickOnceSignerTests()
         {
+            _directoryService = new(Mock.Of<ILogger<IDirectoryService>>());
             _signer = new ClickOnceSigner(
                 Mock.Of<ISignatureAlgorithmProvider>(),
                 Mock.Of<ICertificateProvider>(),

test/Sign.Core.Test/DataFormatSigners/NuGetSignerTests.cs

@@ -135,8 +135,7 @@ public async Task SignAsync_WhenSigningFails_Throws()
                 matcher: null,
                 antiMatcher: null);
 
-            DirectoryService directoryService = new(Mock.Of<ILogger<IDirectoryService>>());
-
+            using (DirectoryService directoryService = new(Mock.Of<ILogger<IDirectoryService>>()))
             using (TemporaryDirectory temporaryDirectory = new(directoryService))
             {
                 FileInfo nupkgFile = TestFileCreator.CreateEmptyZipFile(temporaryDirectory, fileExtension: ".nupkg");

test/Sign.Core.Test/DataFormatSigners/VsixSignerTests.cs

@@ -119,8 +119,7 @@ public async Task SignAsync_WhenSigningFails_Throws()
                 matcher: null,
                 antiMatcher: null);
 
-            DirectoryService directoryService = new(Mock.Of<ILogger<IDirectoryService>>());
-
+            using (DirectoryService directoryService = new(Mock.Of<ILogger<IDirectoryService>>()))
             using (TemporaryDirectory temporaryDirectory = new(directoryService))
             {
                 FileInfo vsixFile = TestFileCreator.CreateEmptyZipFile(temporaryDirectory, fileExtension: ".vsix");
@@ -155,7 +154,5 @@ public async Task SignAsync_WhenSigningFails_Throws()
                 }
             }
         }
-
-
     }
 }