From 0cef8ead26c51b7042e45e26ac9643c7ffd52df7 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Wed, 31 May 2023 22:55:55 +1000 Subject: [PATCH 1/2] Bump several unit test package versions --- eng/imports/Packages.targets | 16 +++++----- .../AssertEx.cs | 16 ---------- .../Build/BuildUtilitiesTests.cs | 2 +- ...tConfigurationDimensionProviderTestBase.cs | 2 +- .../Debug/LaunchSettingsProviderTests.cs | 32 +++++++++---------- .../DebugProfileEnumValuesGeneratorTests.cs | 2 +- .../CompileItemHandler_CommandLineTests.cs | 2 +- .../MetadataReferenceItemHandlerTests.cs | 4 +-- .../DesignTimeInputsChangeTrackerTests.cs | 2 +- .../TempPE/DesignTimeInputsCompilerTests.cs | 2 +- .../DesignTimeInputsFileWatcherTests.cs | 2 +- 11 files changed, 33 insertions(+), 49 deletions(-) diff --git a/eng/imports/Packages.targets b/eng/imports/Packages.targets index e69108984ee..6e75540b0cf 100644 --- a/eng/imports/Packages.targets +++ b/eng/imports/Packages.targets @@ -93,16 +93,16 @@ - + - - - + + + - - - - + + + + diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/AssertEx.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/AssertEx.cs index 32d1dc89940..467e1f16543 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/AssertEx.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/AssertEx.cs @@ -1,27 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information. -using System.Collections; using Xunit.Sdk; namespace Xunit { internal static class AssertEx { - public static void CollectionLength(IEnumerable collection, int expectedCount) - { - int actualCount = collection.Count(); - - if (actualCount != expectedCount) - { - throw new CollectionException(collection, expectedCount, actualCount); - } - } - - public static void CollectionLength(IEnumerable collection, int expectedCount) - { - CollectionLength(collection.Cast(), expectedCount); - } - public static void SequenceSame(IEnumerable expected, IEnumerable actual) where T : class { using IEnumerator expectedEnumerator = expected.GetEnumerator(); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Build/BuildUtilitiesTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Build/BuildUtilitiesTests.cs index 3b555b48938..e05d8dd2b45 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Build/BuildUtilitiesTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Build/BuildUtilitiesTests.cs @@ -108,7 +108,7 @@ public void GetOrAddProperty_FirstGroup() var project = ProjectRootElementFactory.Create(projectXml); BuildUtilities.GetOrAddProperty(project, "MyProperty"); Assert.Single(project.Properties); - AssertEx.CollectionLength(project.PropertyGroups, 2); + Assert.Equal(2, project.PropertyGroups.Count); var group = project.PropertyGroups.First(); Assert.Single(group.Properties); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Configuration/ProjectConfigurationDimensionProviderTestBase.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Configuration/ProjectConfigurationDimensionProviderTestBase.cs index 354ce434d2d..c0b13a8fe9d 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Configuration/ProjectConfigurationDimensionProviderTestBase.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Configuration/ProjectConfigurationDimensionProviderTestBase.cs @@ -88,7 +88,7 @@ public async Task GetProjectConfigurationDimensionsAsync() var (key, value) = Assert.Single(values); Assert.Equal(DimensionName, key); string[] dimensionValues = value.ToArray(); - AssertEx.CollectionLength(dimensionValues, 3); + Assert.Equal(3, dimensionValues.Length); Assert.Equal("A", dimensionValues[0]); Assert.Equal("B", dimensionValues[1]); Assert.Equal("C", dimensionValues[2]); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Debug/LaunchSettingsProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Debug/LaunchSettingsProviderTests.cs index 9a58fc0a3ef..e8cf388549c 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Debug/LaunchSettingsProviderTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Debug/LaunchSettingsProviderTests.cs @@ -316,7 +316,7 @@ public async Task ReadProfilesFromDisk_JsonWithExtensionsNoProvider() var (profiles, globalSettings) = await provider.ReadSettingsFileFromDiskTestAsync(); - AssertEx.CollectionLength(profiles, 2); + Assert.Equal(2, profiles.Count()); var (name, value) = Assert.Single(globalSettings); Assert.Equal("iisSettings", name); @@ -337,9 +337,9 @@ public async Task ReadProfilesFromDisk_JsonWithExtensionsWithProvider() SetJsonSerializationProviders(provider); var (profiles, globalSettings) = await provider.ReadSettingsFileFromDiskTestAsync(); - - AssertEx.CollectionLength(profiles, 2); - + + Assert.Equal(2, profiles.Count()); + var (name, value) = Assert.Single(globalSettings); Assert.Equal("iisSettings", name); Assert.IsType(value); @@ -436,11 +436,11 @@ public async Task LaunchSettingsFile_TestTimeStampFlag() await moqFS.WriteAllTextAsync(provider.LaunchSettingsFile, JsonStringWithWebSettings); provider.LastSettingsFileSyncTimeTest = moqFS.GetLastFileWriteTimeOrMinValueUtc(provider.LaunchSettingsFile); Assert.Equal(provider.LaunchSettingsFile_ChangedTest(), Task.CompletedTask); - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 4); + Assert.Equal(4, provider.CurrentSnapshot.Profiles.Count); await moqFS.WriteAllTextAsync(provider.LaunchSettingsFile, JsonStringWithWebSettings); await provider.LaunchSettingsFile_ChangedTest(); - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 2); + Assert.Equal(2, provider.CurrentSnapshot.Profiles.Count); } [Fact] @@ -503,7 +503,7 @@ public async Task UpdateAndSaveProfilesAsync() Assert.Equal(JsonStringWithWebSettings, await moqFS.ReadAllTextAsync(provider.LaunchSettingsFile), ignoreLineEndingDifferences: true); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 2); + Assert.Equal(2, provider.CurrentSnapshot.Profiles.Count); Assert.Single(provider.CurrentSnapshot.GlobalSettings); Assert.Equal(123, ((IVersionedLaunchSettings)provider.CurrentSnapshot).Version); @@ -607,7 +607,7 @@ public async Task AddOrUpdateProfileAsync_ProfileDoesntExist(bool addToFront, in Assert.Equal(!isInMemory, moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 3); + Assert.Equal(3, provider.CurrentSnapshot.Profiles.Count); Assert.Equal("Test", provider.CurrentSnapshot.Profiles[expectedIndex].CommandName); Assert.Null(provider.CurrentSnapshot.Profiles[expectedIndex].ExecutablePath); Assert.True(((IVersionedLaunchSettings)provider.CurrentSnapshot).Version >= 123); @@ -643,7 +643,7 @@ public async Task AddOrUpdateProfileAsync_ProfileExists(bool addToFront, int exp Assert.Equal(!isInMemory || (isInMemory && !existingIsInMemory), moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 3); + Assert.Equal(3, provider.CurrentSnapshot.Profiles.Count); Assert.Equal("test", provider.CurrentSnapshot.Profiles[expectedIndex].Name); Assert.Equal("Test", provider.CurrentSnapshot.Profiles[expectedIndex].CommandName); Assert.Null(provider.CurrentSnapshot.Profiles[expectedIndex].ExecutablePath); @@ -684,7 +684,7 @@ await provider.TryUpdateProfileAsync("test", p => Assert.Equal(!isInMemory || (isInMemory && !existingIsInMemory), moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 3); + Assert.Equal(3, provider.CurrentSnapshot.Profiles.Count); Assert.Equal("test", provider.CurrentSnapshot.Profiles[expectedIndex].Name); Assert.Equal("Test", provider.CurrentSnapshot.Profiles[expectedIndex].CommandName); Assert.Equal("c:\\test\\project\\bin\\test.exe", provider.CurrentSnapshot.Profiles[expectedIndex].ExecutablePath); @@ -717,7 +717,7 @@ public async Task RemoveProfileAsync_ProfileExists(bool isInMemory) Assert.Equal(!isInMemory, moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 2); + Assert.Equal(2, provider.CurrentSnapshot.Profiles.Count); Assert.Null(provider.CurrentSnapshot.Profiles.FirstOrDefault(p => p.Name!.Equals("test"))); Assert.True(((IVersionedLaunchSettings)provider.CurrentSnapshot).Version >= 123); } @@ -747,7 +747,7 @@ public async Task RemoveProfileAsync_ProfileDoesntExists() Assert.False(moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.Profiles, 2); + Assert.Equal(2, provider.CurrentSnapshot.Profiles.Count); Assert.Equal(42, ((IVersionedLaunchSettings)provider.CurrentSnapshot).Version); } @@ -775,7 +775,7 @@ public async Task AddOrUpdateGlobalSettingAsync_SettingDoesntExist(bool isInMemo // Check disk file was written Assert.Equal(!isInMemory, moqFS.FileExists(provider.LaunchSettingsFile)); - AssertEx.CollectionLength(provider.CurrentSnapshot.GlobalSettings, 2); + Assert.Equal(2, provider.CurrentSnapshot.GlobalSettings.Count); // Check snapshot Assert.True(provider.CurrentSnapshot.GlobalSettings.TryGetValue("iisSettings", out object? updatedSettings)); @@ -811,7 +811,7 @@ await provider.UpdateGlobalSettingsAsync(existing => { // Check disk file was written Assert.Equal(!isInMemory, moqFS.FileExists(provider.LaunchSettingsFile)); - AssertEx.CollectionLength(provider.CurrentSnapshot.GlobalSettings, 2); + Assert.Equal(2, provider.CurrentSnapshot.GlobalSettings.Count); // Check snapshot Assert.True(provider.CurrentSnapshot.GlobalSettings.TryGetValue("iisSettings", out object? updatedSettings)); @@ -849,7 +849,7 @@ public async Task AddOrUpdateGlobalSettingAsync_SettingExists(bool isInMemory, b Assert.Equal(!isInMemory || (isInMemory && !existingIsInMemory), moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.GlobalSettings, 2); + Assert.Equal(2, provider.CurrentSnapshot.GlobalSettings.Count); Assert.True(provider.CurrentSnapshot.GlobalSettings.TryGetValue("iisSettings", out object? updatedSettings)); Assert.True(((IISSettingsData)updatedSettings).WindowsAuthentication); Assert.True(((IVersionedLaunchSettings)provider.CurrentSnapshot).Version >= 123); @@ -889,7 +889,7 @@ await provider.UpdateGlobalSettingsAsync(existing => { Assert.Equal(!isInMemory || (isInMemory && !existingIsInMemory), moqFS.FileExists(provider.LaunchSettingsFile)); // Check snapshot - AssertEx.CollectionLength(provider.CurrentSnapshot.GlobalSettings, 2); + Assert.Equal(2, provider.CurrentSnapshot.GlobalSettings.Count); Assert.True(provider.CurrentSnapshot.GlobalSettings.TryGetValue("iisSettings", out object? updatedSettings)); Assert.True(((IISSettingsData)updatedSettings).WindowsAuthentication); Assert.True(((IVersionedLaunchSettings)provider.CurrentSnapshot).Version >= 123); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Debug/DebugProfileEnumValuesGeneratorTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Debug/DebugProfileEnumValuesGeneratorTests.cs index abcb4dcd068..81b7a76a6ef 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Debug/DebugProfileEnumValuesGeneratorTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Debug/DebugProfileEnumValuesGeneratorTests.cs @@ -33,7 +33,7 @@ public async Task DebugProfileEnumValuesGenerator_GetListsValuesAsyncTests() var generator = new DebugProfileEnumValuesGenerator(moqProfileProvider.Object, threadingService); ICollection results = await generator.GetListedValuesAsync(); - AssertEx.CollectionLength(results, 5); + Assert.Equal(5, results.Count); Assert.True(results.ElementAt(0).Name == "Profile1" && results.ElementAt(0).DisplayName == "Profile1"); Assert.True(results.ElementAt(1).Name == "MyCommand" && results.ElementAt(1).DisplayName == "MyCommand"); Assert.True(results.ElementAt(2).Name == "Foo" && results.ElementAt(2).DisplayName == "Foo"); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/CompileItemHandler_CommandLineTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/CompileItemHandler_CommandLineTests.cs index 4ade591a600..c497f4d03c6 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/CompileItemHandler_CommandLineTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/CompileItemHandler_CommandLineTests.cs @@ -34,7 +34,7 @@ public void UniqueSourceFilesPushedToWorkspace() handler.Handle(context, 10, added: added, removed: empty, new ContextState(isActiveEditorContext: true, isActiveConfiguration: false), logger: logger); - AssertEx.CollectionLength(sourceFilesPushedToWorkspace, 2); + Assert.Equal(2, sourceFilesPushedToWorkspace.Count); Assert.Contains(@"C:\file1.cs", sourceFilesPushedToWorkspace); Assert.Contains(@"C:\file2.cs", sourceFilesPushedToWorkspace); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/MetadataReferenceItemHandlerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/MetadataReferenceItemHandlerTests.cs index 77ff84915d4..ec1899bc05e 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/MetadataReferenceItemHandlerTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/LanguageServices/Handlers/MetadataReferenceItemHandlerTests.cs @@ -25,7 +25,7 @@ public void DuplicateMetadataReferencesPushedToWorkspace() handler.Handle(context, 10, added: added, removed: empty, new ContextState(isActiveEditorContext: true, isActiveConfiguration: false), logger: logger); - AssertEx.CollectionLength(referencesPushedToWorkspace, 2); + Assert.Equal(2, referencesPushedToWorkspace.Count); Assert.Contains(@"C:\Assembly1.dll", referencesPushedToWorkspace); Assert.Contains(@"C:\Assembly2.dll", referencesPushedToWorkspace); @@ -54,7 +54,7 @@ public void RootedReferencesPushedToWorkspace() handler.Handle(context, 10, added: added, removed: removed, new ContextState(isActiveEditorContext: true, isActiveConfiguration: false), logger: logger); - AssertEx.CollectionLength(referencesPushedToWorkspace, 3); + Assert.Equal(3, referencesPushedToWorkspace.Count); Assert.Contains(@"C:\ProjectFolder\Assembly1.dll", referencesPushedToWorkspace); Assert.Contains(@"C:\ProjectFolder\Assembly2.dll", referencesPushedToWorkspace); Assert.Contains(@"C:\ProjectFolder\Assembly3.dll", referencesPushedToWorkspace); diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs index f7f4052fe96..caaec17c38f 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs @@ -267,7 +267,7 @@ private async Task VerifyOutput(int numberOfOutputExpected, Action actionThatCau { if (_outputProduced.Count != numberOfOutputExpected) { - throw new AssertActualExpectedException(numberOfOutputExpected, _outputProduced.Count, $"Timed out after {TestTimeoutMillisecondsDelay}ms"); + throw EqualException.ForMismatchedValues(numberOfOutputExpected, _outputProduced.Count, $"Timed out after {TestTimeoutMillisecondsDelay}ms"); } } } diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs index d8203cc6af9..663231b20e1 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs @@ -330,7 +330,7 @@ private async Task VerifyDLLsCompiled(int numberOfDLLsExpected, Action actionTha var actualDLLs = _compilationResults.Count - initialCompilations; if (numberOfDLLsExpected != actualDLLs) { - throw new AssertActualExpectedException(numberOfDLLsExpected, actualDLLs, $"Timed out after {TestTimeoutMillisecondsDelay}ms"); + throw EqualException.ForMismatchedValues(numberOfDLLsExpected, actualDLLs, $"Timed out after {TestTimeoutMillisecondsDelay}ms"); } } } diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs index 31f49f52945..7af30a6fa91 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs @@ -118,7 +118,7 @@ internal async Task VerifyDesignTimeInputsWatched(string[] designTimeInputs, str // The timeout here is annoying, but even though our test is "smart" and waits for data, unfortunately if the code breaks the test is more likely to hang than fail if (await Task.WhenAny(finished.Task, Task.Delay(TestTimeoutMillisecondsDelay)) != finished.Task) { - throw new AssertActualExpectedException(fileChangeNotificationsExpected.Length, notificationCount, $"Timed out after {TestTimeoutMillisecondsDelay}ms"); + throw EqualException.ForMismatchedValues(fileChangeNotificationsExpected.Length, notificationCount, $"Timed out after {TestTimeoutMillisecondsDelay}ms"); } // Observe the task in case of exceptions From c083aa7fa6e00c17020d90f21ae5d49b51938609 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 1 Jun 2023 08:23:33 +1000 Subject: [PATCH 2/2] Bump Verify.Xunit package version --- eng/imports/Packages.targets | 4 ++-- .../Setup/PackageContentTests.cs | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/eng/imports/Packages.targets b/eng/imports/Packages.targets index 6e75540b0cf..850f63d6682 100644 --- a/eng/imports/Packages.targets +++ b/eng/imports/Packages.targets @@ -94,7 +94,7 @@ - + @@ -113,4 +113,4 @@ - \ No newline at end of file + diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs index 164969eb8d1..d45d17d406a 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs @@ -2,8 +2,6 @@ using System.IO.Compression; using Microsoft.VisualStudio.Utilities; -using VerifyTests; -using VerifyXunit; namespace Microsoft.VisualStudio.Setup { @@ -19,7 +17,7 @@ public Task ProjectSystem() { IEnumerable files = GetPackageContents("ProjectSystem.vsix"); VerifierSettings.ScrubLinesContaining(DigitalSignature, Rels); - return Verifier.Verify(files); + return Verify(files); } [Fact] @@ -27,7 +25,7 @@ public Task VisualStudioEditorsSetup() { IEnumerable files = GetPackageContents("VisualStudioEditorsSetup.vsix"); VerifierSettings.ScrubLinesContaining(DigitalSignature, Rels); - return Verifier.Verify(files); + return Verify(files); } [Fact] @@ -38,7 +36,7 @@ public Task CommonFiles() // manifest.json is the last line for non-signed builds. // It will not contain a comma in this situation, so we need special logic for that. VerifierSettings.ScrubLinesWithReplace(s => s.EndsWith("manifest.json") ? " manifest.json," : s); - return Verifier.Verify(files); + return Verify(files); } private static IEnumerable GetPackageContents(string vsixName)