diff options
author | Bob Arnson <bob@firegiant.com> | 2021-12-05 21:16:28 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2021-12-25 20:31:10 -0500 |
commit | 667ee81ee0263314b4546f5598efc66fe84c08b7 (patch) | |
tree | cfc2077743411a93d0e3c0d2ef637ef9bbdb655e /src/api/burn/balutil | |
parent | b9c712f26d921f7ffe0509d1cc45456680e8139f (diff) | |
download | wix-667ee81ee0263314b4546f5598efc66fe84c08b7.tar.gz wix-667ee81ee0263314b4546f5598efc66fe84c08b7.tar.bz2 wix-667ee81ee0263314b4546f5598efc66fe84c08b7.zip |
Build with VS2022, which is now required.
- Use VS2022/v143 libraries exclusively. C++ compatibility works.
Diffstat (limited to 'src/api/burn/balutil')
-rw-r--r-- | src/api/burn/balutil/balutil.nuspec | 11 | ||||
-rw-r--r-- | src/api/burn/balutil/balutil.vcxproj | 1 | ||||
-rw-r--r-- | src/api/burn/balutil/build/WixToolset.BalUtil.props | 14 |
3 files changed, 5 insertions, 21 deletions
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec index 2474b2ea..d89dbe22 100644 --- a/src/api/burn/balutil/balutil.nuspec +++ b/src/api/burn/balutil/balutil.nuspec | |||
@@ -20,13 +20,8 @@ | |||
20 | <files> | 20 | <files> |
21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
23 | <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v143\x86\balutil.lib" target="build\native\v14\x86" /> |
24 | <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v143\x64\balutil.lib" target="build\native\v14\x64" /> |
25 | <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v143\ARM64\balutil.lib" target="build\native\v14\ARM64" /> |
26 | <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" /> | ||
27 | <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> | ||
28 | <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" /> | ||
29 | <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" /> | ||
30 | <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> | ||
31 | </files> | 26 | </files> |
32 | </package> | 27 | </package> |
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj index 8f763324..42a86fd1 100644 --- a/src/api/burn/balutil/balutil.vcxproj +++ b/src/api/burn/balutil/balutil.vcxproj | |||
@@ -33,7 +33,6 @@ | |||
33 | <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid> | 33 | <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid> |
34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
35 | <TargetName>balutil</TargetName> | 35 | <TargetName>balutil</TargetName> |
36 | <PlatformToolset>v142</PlatformToolset> | ||
37 | <CharacterSet>MultiByte</CharacterSet> | 36 | <CharacterSet>MultiByte</CharacterSet> |
38 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> | 37 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> |
39 | <PackageId>WixToolset.BalUtil</PackageId> | 38 | <PackageId>WixToolset.BalUtil</PackageId> |
diff --git a/src/api/burn/balutil/build/WixToolset.BalUtil.props b/src/api/burn/balutil/build/WixToolset.BalUtil.props index 45b97f6a..b276574d 100644 --- a/src/api/burn/balutil/build/WixToolset.BalUtil.props +++ b/src/api/burn/balutil/build/WixToolset.BalUtil.props | |||
@@ -10,19 +10,9 @@ | |||
10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
11 | </ResourceCompile> | 11 | </ResourceCompile> |
12 | </ItemDefinitionGroup> | 12 | </ItemDefinitionGroup> |
13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) "> | 13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) "> |
14 | <Link> | 14 | <Link> |
15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
16 | </Link> | ||
17 | </ItemDefinitionGroup> | ||
18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> | ||
19 | <Link> | ||
20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
21 | </Link> | ||
22 | </ItemDefinitionGroup> | ||
23 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) "> | ||
24 | <Link> | ||
25 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
26 | </Link> | 16 | </Link> |
27 | </ItemDefinitionGroup> | 17 | </ItemDefinitionGroup> |
28 | </Project> | 18 | </Project> |