diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-03-05 21:40:55 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-05 21:44:55 -0500 |
| commit | 291cf40c5f0578fbd76fc3150d54f98b50066dcf (patch) | |
| tree | c39ff2ddbdc30bad41329d34e616ce3b8388b387 /src | |
| parent | 1fc7ee285b111661195247f0e7aafd43f2ba36de (diff) | |
| download | wix-291cf40c5f0578fbd76fc3150d54f98b50066dcf.tar.gz wix-291cf40c5f0578fbd76fc3150d54f98b50066dcf.tar.bz2 wix-291cf40c5f0578fbd76fc3150d54f98b50066dcf.zip | |
Update WixCop tests for versioned extension id changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs b/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs index be487147..b28c94e4 100644 --- a/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs +++ b/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | <Property Id="QtExecCmdTimeout" Value="600000" /> | 17 | <Property Id="QtExecCmdTimeout" Value="600000" /> |
| 18 | <CustomAction Id="InstallVSTemplateCommand" Property="WixQuietExecCmdLine" Value=""[VSENVPRODUCT80]\devenv.exe" /setup" /> | 18 | <CustomAction Id="InstallVSTemplateCommand" Property="WixQuietExecCmdLine" Value=""[VSENVPRODUCT80]\devenv.exe" /setup" /> |
| 19 | <CustomAction Id="InstallVSTemplate" BinaryKey="UtilCA" DllEntry="WixQuietExec" Return="asyncWait" /> | 19 | <CustomAction Id="InstallVSTemplate" BinaryKey="Wix4UtilCA_X86" DllEntry="WixQuietExec" Return="asyncWait" /> |
| 20 | 20 | ||
| 21 | <Feature Id="Feature_WiX" Title="WiX Toolset" Level="1"> | 21 | <Feature Id="Feature_WiX" Title="WiX Toolset" Level="1"> |
| 22 | <Component Id="Licensing" Directory="INSTALLFOLDER"> | 22 | <Component Id="Licensing" Directory="INSTALLFOLDER"> |
diff --git a/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs b/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs index 22a961b2..99cc2151 100644 --- a/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs +++ b/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | <MediaTemplate CabinetTemplate="core{0}.cab" /> | 15 | <MediaTemplate CabinetTemplate="core{0}.cab" /> |
| 16 | 16 | ||
| 17 | <CustomAction Id="InstallVSTemplateCommand" Property="WixQuietExecCmdLine" Value=""[VSENVPRODUCT80]\devenv.exe" /setup" /> | 17 | <CustomAction Id="InstallVSTemplateCommand" Property="WixQuietExecCmdLine" Value=""[VSENVPRODUCT80]\devenv.exe" /setup" /> |
| 18 | <CustomAction Id="InstallVSTemplate" BinaryKey="UtilCA" DllEntry="WixQuietExec" Return="asyncWait" /> | 18 | <CustomAction Id="InstallVSTemplate" BinaryKey="Wix4UtilCA_X86" DllEntry="WixQuietExec" Return="asyncWait" /> |
| 19 | 19 | ||
| 20 | <Feature Id="Feature_WiX" Title="WiX Toolset" Level="1"> | 20 | <Feature Id="Feature_WiX" Title="WiX Toolset" Level="1"> |
| 21 | <Component Id="Licensing" Directory="INSTALLFOLDER"> | 21 | <Component Id="Licensing" Directory="INSTALLFOLDER"> |
