aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2019-11-05 19:27:06 -0500
committerBob Arnson <bob@firegiant.com>2019-11-05 19:32:42 -0500
commit0f65aaaca2faf1b6fc233c445216d547f08c6fa5 (patch)
tree656e070ac1fe3b8e609002196f325386f6220731 /src/test
parente6f381b0ce2011ced88697ca7ddaae8a053b57d7 (diff)
downloadwix-0f65aaaca2faf1b6fc233c445216d547f08c6fa5.tar.gz
wix-0f65aaaca2faf1b6fc233c445216d547f08c6fa5.tar.bz2
wix-0f65aaaca2faf1b6fc233c445216d547f08c6fa5.zip
Move creation of hidden properties...
...for deferred CAs with HideTarget="yes" to the MSI backend where it belongs.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs5
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index fff37618..febf3b62 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -3,6 +3,7 @@
3namespace WixToolsetTest.CoreIntegration 3namespace WixToolsetTest.CoreIntegration
4{ 4{
5 using System.IO; 5 using System.IO;
6 using System.Linq;
6 using WixBuildTools.TestSupport; 7 using WixBuildTools.TestSupport;
7 using WixToolset.Core.TestPackage; 8 using WixToolset.Core.TestPackage;
8 using Xunit; 9 using Xunit;
@@ -281,8 +282,12 @@ namespace WixToolsetTest.CoreIntegration
281 { 282 {
282 "Binary:Binary1\t[Binary data]", 283 "Binary:Binary1\t[Binary data]",
283 "CustomAction:CustomAction1\t1\tBinary1\tInvalidEntryPoint\t", 284 "CustomAction:CustomAction1\t1\tBinary1\tInvalidEntryPoint\t",
285 "CustomAction:CustomActionWithHiddenTarget\t9217\tBinary1\tInvalidEntryPoint\t",
284 "CustomAction:DiscardOptimismAllBeingsWhoProceed\t19\t\tAbandon hope all ye who enter here.\t", 286 "CustomAction:DiscardOptimismAllBeingsWhoProceed\t19\t\tAbandon hope all ye who enter here.\t",
285 }, results); 287 }, results);
288 var properties = Query.QueryDatabase(msiPath, new[] { "Property" });
289 var hiddenProperties = properties.Where(q => q.StartsWith("Property:MsiHiddenProperties")).Single();
290 Assert.Equal("Property:MsiHiddenProperties\tCustomActionWithHiddenTarget", hiddenProperties);
286 } 291 }
287 } 292 }
288 293
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
index e4b066e9..00ac2810 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
@@ -6,7 +6,8 @@
6 </ComponentGroup> 6 </ComponentGroup>
7 7
8 <Binary Id="Binary1" SourceFile="test.txt"></Binary> 8 <Binary Id="Binary1" SourceFile="test.txt"></Binary>
9 <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint"></CustomAction> 9 <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" />
10 <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." /> 10 <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
11 <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" />
11 </Fragment> 12 </Fragment>
12</Wix> 13</Wix>