Integrate tools with SuppressModularization fix
Resolves wixtoolset/issues#5944
Rob Mensching committed
Mar 1, 2021 at 12:37 UTC
2fc5d7b5d24ad2174a2b429e9807158a04b6a478
3 files changed
+4
-5
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0163"
3
+ "WixToolset.Sdk": "4.0.0-build-0192"
4
}
5
}
src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
+3
-3
@@ -10,16 +10,16 @@ namespace WixToolsetTest.ComPlus
10
11
public class ComPlusExtensionFixture
12
{
13
- [Fact(Skip = "Currently fails due to duplicate symbols")]
13
+ [Fact]
14
public void CanBuildUsingComPlusPartition()
15
{
16
var folder = TestData.Get(@"TestData\UsingComPlusPartition");
17
var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder });
18
19
var results = build.BuildAndQuery(Build, "ComPlusPartition");
20
- Assert.Equal(new[]
20
+ WixAssert.CompareLineByLine(new[]
21
{
22
- "ComPlusPartition:",
22
+ "ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition",
23
}, results);
24
}
25
src/wixlib/ComPlusExtension.wxs
-1
@@ -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. -->
2
3
-
3
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4
<?include caerr.wxi ?>
5