aboutsummaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2024-06-10 18:43:55 -0400
committerRob Mensching <rob@firegiant.com>2024-10-04 12:06:17 -0700
commit6b0a0837afdcaea5cf6f55832ad88fb147b9860b (patch)
treea9b70f2355c0c28a3b81bc2de844b336a7ab3cd8 /src/libs
parentcff717e0122bbb52d4d808d9b2cca88f25451211 (diff)
downloadwix-6b0a0837afdcaea5cf6f55832ad88fb147b9860b.tar.gz
wix-6b0a0837afdcaea5cf6f55832ad88fb147b9860b.tar.bz2
wix-6b0a0837afdcaea5cf6f55832ad88fb147b9860b.zip
Build native code with VC v143 toolset only.
v143 output is compatible back to VS2017 (at least). Fixes https://github.com/wixtoolset/issues/issues/8211.
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/dutil.nuspec6
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 122ad9f9..a87da122 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -18,8 +18,8 @@
18 <file src="$projectFolder$\build\$id$.props" target="build\" /> 18 <file src="$projectFolder$\build\$id$.props" target="build\" />
19 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 19 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20 <file src="$projectFolder$\inc\*" target="build\native\include" /> 20 <file src="$projectFolder$\inc\*" target="build\native\include" />
21 <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" /> 21 <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
22 <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" /> 22 <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
23 <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" /> 23 <file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
24 </files> 24 </files>
25</package> 25</package>
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index 74e925fe..c2c4159e 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -21,8 +21,8 @@
21 <file src="$projectFolder$\build\$id$.props" target="build\" /> 21 <file src="$projectFolder$\build\$id$.props" target="build\" />
22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23 <file src="$projectFolder$\inc\*" target="build\native\include" /> 23 <file src="$projectFolder$\inc\*" target="build\native\include" />
24 <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" /> 24 <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
25 <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" /> 26 <file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
27 </files> 27 </files>
28</package> 28</package>