diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs | 6 | ||||
| -rw-r--r-- | src/wixlib/ComPlusExtension.wxs | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs b/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs index 8993205a..ace4d6b6 100644 --- a/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs +++ b/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs | |||
| @@ -10,16 +10,16 @@ namespace WixToolsetTest.ComPlus | |||
| 10 | 10 | ||
| 11 | public class ComPlusExtensionFixture | 11 | public class ComPlusExtensionFixture |
| 12 | { | 12 | { |
| 13 | [Fact(Skip = "Currently fails due to duplicate symbols")] | 13 | [Fact] |
| 14 | public void CanBuildUsingComPlusPartition() | 14 | public void CanBuildUsingComPlusPartition() |
| 15 | { | 15 | { |
| 16 | var folder = TestData.Get(@"TestData\UsingComPlusPartition"); | 16 | var folder = TestData.Get(@"TestData\UsingComPlusPartition"); |
| 17 | var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder }); |
| 18 | 18 | ||
| 19 | var results = build.BuildAndQuery(Build, "ComPlusPartition"); | 19 | var results = build.BuildAndQuery(Build, "ComPlusPartition"); |
| 20 | Assert.Equal(new[] | 20 | WixAssert.CompareLineByLine(new[] |
| 21 | { | 21 | { |
| 22 | "ComPlusPartition:", | 22 | "ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition", |
| 23 | }, results); | 23 | }, results); |
| 24 | } | 24 | } |
| 25 | 25 | ||
diff --git a/src/wixlib/ComPlusExtension.wxs b/src/wixlib/ComPlusExtension.wxs index d41e327e..fe74eeae 100644 --- a/src/wixlib/ComPlusExtension.wxs +++ b/src/wixlib/ComPlusExtension.wxs | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 2 | 2 | ||
| 3 | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?include caerr.wxi ?> | 4 | <?include caerr.wxi ?> |
| 6 | 5 | ||
