diff options
Diffstat (limited to 'src/test')
4 files changed, 10 insertions, 13 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs index 56c07eb9..be991c65 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | 2 | <Fragment> |
| 4 | <ComponentGroup Id="ProductComponents"> | 3 | <ComponentGroup Id="ProductComponents"> |
| 5 | <ComponentGroupRef Id="MinimalComponentGroup" /> | 4 | <ComponentGroupRef Id="MinimalComponentGroup" /> |
| 6 | </ComponentGroup> | 5 | </ComponentGroup> |
| 7 | 6 | ||
| 8 | <Binary Id="Binary1" SourceFile="test.txt" /> | 7 | <Binary Id="Binary1" SourceFile="test.txt" /> |
| 9 | <CustomAction Id="Action1" BinaryKey="Binary1" DllEntry="EntryPoint1" /> | 8 | <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" /> |
| 10 | <CustomAction Id="Action2" BinaryKey="Binary1" DllEntry="EntryPoint2" /> | 9 | <CustomAction Id="Action2" DllEntry="EntryPoint2" BinaryRef="Binary1" /> |
| 11 | <CustomAction Id="Action3" BinaryKey="Binary1" DllEntry="EntryPoint3" /> | 10 | <CustomAction Id="Action3" DllEntry="EntryPoint3" BinaryRef="Binary1" /> |
| 12 | 11 | ||
| 13 | <InstallExecuteSequence> | 12 | <InstallExecuteSequence> |
| 14 | <Custom Action="Action1" After="Action2" /> | 13 | <Custom Action="Action1" After="Action2" /> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs index 72d5e4a5..ff8741cf 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs | |||
| @@ -1,12 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | 2 | <Fragment> |
| 4 | <ComponentGroup Id="ProductComponents"> | 3 | <ComponentGroup Id="ProductComponents"> |
| 5 | <ComponentGroupRef Id="MinimalComponentGroup" /> | 4 | <ComponentGroupRef Id="MinimalComponentGroup" /> |
| 6 | </ComponentGroup> | 5 | </ComponentGroup> |
| 7 | 6 | ||
| 8 | <Binary Id="Binary1" SourceFile="test.txt" /> | 7 | <Binary Id="Binary1" SourceFile="test.txt" /> |
| 9 | <CustomAction Id="Action1" BinaryKey="Binary1" DllEntry="EntryPoint1" /> | 8 | <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" /> |
| 10 | 9 | ||
| 11 | <InstallExecuteSequence> | 10 | <InstallExecuteSequence> |
| 12 | <Custom Action="Action1" After="InstallFiles" /> | 11 | <Custom Action="Action1" After="InstallFiles" /> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs index 0784824a..f8ce1c38 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | 2 | <Fragment> |
| 4 | <ComponentGroup Id="ProductComponents"> | 3 | <ComponentGroup Id="ProductComponents"> |
| 5 | <ComponentGroupRef Id="MinimalComponentGroup" /> | 4 | <ComponentGroupRef Id="MinimalComponentGroup" /> |
| 6 | </ComponentGroup> | 5 | </ComponentGroup> |
| 7 | 6 | ||
| 8 | <Binary Id="Binary1" SourceFile="test.txt" /> | 7 | <Binary Id="Binary1" SourceFile="test.txt" /> |
| 9 | <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" /> | 8 | <CustomAction Id="CustomAction1" DllEntry="InvalidEntryPoint" BinaryRef="Binary1" /> |
| 10 | <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." /> | 9 | <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." /> |
| 11 | <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" /> | 10 | <CustomAction Id="CustomActionWithHiddenTarget" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" BinaryRef="Binary1" /> |
| 12 | <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" /> | 11 | <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" /> |
| 13 | <AdminExecuteSequence> | 12 | <AdminExecuteSequence> |
| 14 | <Custom Action="CustomAction2" After="CostInitialize" /> | 13 | <Custom Action="CustomAction2" After="CostInitialize" /> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs index 00a80fca..bf5223c1 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 7 | 7 | ||
| 8 | <CustomAction Id="CAFromExtension" BinaryKey="BinFromWir" DllEntry="DoesntExist" /> | 8 | <CustomAction Id="CAFromExtension" DllEntry="DoesntExist" BinaryRef="BinFromWir" /> |
| 9 | 9 | ||
| 10 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 10 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
| 11 | <ComponentGroupRef Id="ProductComponents" /> | 11 | <ComponentGroupRef Id="ProductComponents" /> |