Fix WixUI_Advanced test and update VC++.
Bob Arnson committed
Jul 26, 2020 at 23:22 UTC
413660d8e47aebb875762db9530862690507cac7
4 files changed
+9
-5
UI.wixext.sln
+2
-2
@@ -1,7 +1,7 @@
1
2
Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 15
4
-VisualStudioVersion = 15.0.27130.2003
3
+# Visual Studio Version 16
4
+VisualStudioVersion = 16.0.30320.27
5
MinimumVisualStudioVersion = 15.0.26124.0
6
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "src\ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}"
7
EndProject
src/ca/uica.vcxproj
+1
-1
@@ -21,7 +21,7 @@
21
<ConfigurationType>DynamicLibrary</ConfigurationType>
22
<CharacterSet>MultiByte</CharacterSet>
23
<TargetName>uica</TargetName>
24
- <PlatformToolset>v141</PlatformToolset>
24
+ <PlatformToolset>v142</PlatformToolset>
25
<ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile>
26
<Description>WiX Toolset UI CustomAction</Description>
27
</PropertyGroup>
src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+5
-1
@@ -16,12 +16,16 @@
16
</ComponentGroup>
17
18
<UIRef Id="WixUI_Advanced" />
19
+ <Property Id="ApplicationFolderName" Value="MyProgram"/>
20
+ <Property Id="WixAppFolder" Value="WixPerMachineFolder"/>
21
</Product>
22
23
<Fragment>
24
<Directory Id="TARGETDIR" Name="SourceDir">
25
<Directory Id="ProgramFilesFolder">
24
- <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
26
+ <Directory Id="INSTALLFOLDER" Name="MsiPackage">
27
+ <Directory Id="APPLICATIONFOLDER" Name="." />
28
+ </Directory>
29
</Directory>
30
</Directory>
31
</Fragment>
src/test/WixToolsetTest.UI/UIExtensionFixture.cs
+1
-1
@@ -10,7 +10,7 @@ namespace WixToolsetTest.UI
10
11
public class UIExtensionFixture
12
{
13
- [Fact(Skip = "WixUI_Advanced is missing because it can't currently compile in v4")]
13
+ [Fact]
14
public void CanBuildUsingWixUIAdvanced()
15
{
16
var folder = TestData.Get(@"TestData\WixUI_Advanced");