From 3eef7b697ecebffc20d13bc2c199573620c38ccf Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 5 Mar 2021 15:15:38 -0600 Subject: Fix Enforce. --- .../WixToolsetTest.Dependency/DependencyExtensionFixture.cs | 10 ++++++++-- .../TestData/UsingProvides/Package.wxs | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src/test') diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs index 968b8de6..708ae658 100644 --- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs +++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs @@ -2,6 +2,8 @@ namespace WixToolsetTest.Dependency { + using System.Linq; + using System.Text.RegularExpressions; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Dependency; @@ -15,11 +17,15 @@ namespace WixToolsetTest.Dependency var folder = TestData.Get(@"TestData\UsingProvides"); var build = new Builder(folder, typeof(DependencyExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(Build, "CustomAction", "WixDependencyProvider"); - Assert.Equal(new[] + var results = build.BuildAndQuery(Build, "CustomAction", "WixDependencyProvider") + .Select(r => Regex.Replace(r, "{[^}]*}", "{*}")) + .ToArray(); + WixAssert.CompareLineByLine(new[] { "CustomAction:Wix4DependencyCheck_X86\t1\tDependencyCA_X86\tWixDependencyCheck\t", + "CustomAction:Wix4DependencyRequire_X86\t1\tDependencyCA_X86\tWixDependencyRequire\t", "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t", + "WixDependencyProvider:depTpv28q7slcxvXPWmU4Z0GfbiI.4\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t{*}\t\t\t", }, results); } diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs index b15ae8da..9351519d 100644 --- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs +++ b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs @@ -9,6 +9,9 @@ + + + -- cgit v1.2.3-55-g6feb