diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ca/uica.vcxproj | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs | 6 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.UI/UIExtensionFixture.cs | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ca/uica.vcxproj b/src/ca/uica.vcxproj index e55494f2..b9d015e4 100644 --- a/src/ca/uica.vcxproj +++ b/src/ca/uica.vcxproj | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 22 | <CharacterSet>MultiByte</CharacterSet> | 22 | <CharacterSet>MultiByte</CharacterSet> |
| 23 | <TargetName>uica</TargetName> | 23 | <TargetName>uica</TargetName> |
| 24 | <PlatformToolset>v141</PlatformToolset> | 24 | <PlatformToolset>v142</PlatformToolset> |
| 25 | <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile> | 25 | <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile> |
| 26 | <Description>WiX Toolset UI CustomAction</Description> | 26 | <Description>WiX Toolset UI CustomAction</Description> |
| 27 | </PropertyGroup> | 27 | </PropertyGroup> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs index 2c3ca0a0..2d383f70 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs | |||
| @@ -16,12 +16,16 @@ | |||
| 16 | </ComponentGroup> | 16 | </ComponentGroup> |
| 17 | 17 | ||
| 18 | <UIRef Id="WixUI_Advanced" /> | 18 | <UIRef Id="WixUI_Advanced" /> |
| 19 | <Property Id="ApplicationFolderName" Value="MyProgram"/> | ||
| 20 | <Property Id="WixAppFolder" Value="WixPerMachineFolder"/> | ||
| 19 | </Product> | 21 | </Product> |
| 20 | 22 | ||
| 21 | <Fragment> | 23 | <Fragment> |
| 22 | <Directory Id="TARGETDIR" Name="SourceDir"> | 24 | <Directory Id="TARGETDIR" Name="SourceDir"> |
| 23 | <Directory Id="ProgramFilesFolder"> | 25 | <Directory Id="ProgramFilesFolder"> |
| 24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 26 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> |
| 27 | <Directory Id="APPLICATIONFOLDER" Name="." /> | ||
| 28 | </Directory> | ||
| 25 | </Directory> | 29 | </Directory> |
| 26 | </Directory> | 30 | </Directory> |
| 27 | </Fragment> | 31 | </Fragment> |
diff --git a/src/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/test/WixToolsetTest.UI/UIExtensionFixture.cs index 09cc26f9..5c63587a 100644 --- a/src/test/WixToolsetTest.UI/UIExtensionFixture.cs +++ b/src/test/WixToolsetTest.UI/UIExtensionFixture.cs | |||
| @@ -10,7 +10,7 @@ namespace WixToolsetTest.UI | |||
| 10 | 10 | ||
| 11 | public class UIExtensionFixture | 11 | public class UIExtensionFixture |
| 12 | { | 12 | { |
| 13 | [Fact(Skip = "WixUI_Advanced is missing because it can't currently compile in v4")] | 13 | [Fact] |
| 14 | public void CanBuildUsingWixUIAdvanced() | 14 | public void CanBuildUsingWixUIAdvanced() |
| 15 | { | 15 | { |
| 16 | var folder = TestData.Get(@"TestData\WixUI_Advanced"); | 16 | var folder = TestData.Get(@"TestData\WixUI_Advanced"); |
