aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-01 12:37:30 -0800
committerRob Mensching <rob@firegiant.com>2021-03-01 14:04:39 -0800
commit2fc5d7b5d24ad2174a2b429e9807158a04b6a478 (patch)
tree1eeefffeb3478fb23be0e9b2a4c6392a439e4e42
parent45d84392eed8a1e6eae4f906ab382858ca23d740 (diff)
downloadwix-2fc5d7b5d24ad2174a2b429e9807158a04b6a478.tar.gz
wix-2fc5d7b5d24ad2174a2b429e9807158a04b6a478.tar.bz2
wix-2fc5d7b5d24ad2174a2b429e9807158a04b6a478.zip
Integrate tools with SuppressModularization fix
Resolves wixtoolset/issues#5944
-rw-r--r--global.json2
-rw-r--r--src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs6
-rw-r--r--src/wixlib/ComPlusExtension.wxs1
3 files changed, 4 insertions, 5 deletions
diff --git a/global.json b/global.json
index 10345833..e101f0d5 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0163" 3 "WixToolset.Sdk": "4.0.0-build-0192"
4 } 4 }
5} 5}
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