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.

7 files changed, 14 insertions, 16 deletions

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index db9bf0b2..9f727a23 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -20,7 +20,7 @@
     <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
 
     <!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
-    <WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset>
+    <WixNativeSdkLibraryToolset>v143</WixNativeSdkLibraryToolset>
     <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
     <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
 
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
index 9064973d..078309a2 100644
--- a/src/Directory.vcxproj.props
+++ b/src/Directory.vcxproj.props
@@ -10,9 +10,8 @@
     <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
   </PropertyGroup>
 
-  <!-- This is needed for v141 toolset, which doesn't understand `10.0` -->
   <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
-    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index be51ec79..e412d891 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -22,8 +22,8 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />
-    <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" />
-    <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
+    <file src="..\..\v143\x86\balutil.lib" target="build\native\v14\x86" />
+    <file src="..\..\v143\x64\balutil.lib" target="build\native\v14\x64" />
+    <file src="..\..\v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
   </files>
 </package>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 125e8807..dd17e79d 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -22,8 +22,8 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
-    <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
-    <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
+    <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
+    <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
+    <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
   </files>
 </package>
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 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
-    <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
-    <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" />
+    <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
+    <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
+    <file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
   </files>
 </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 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
-    <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
-    <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
+    <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
+    <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
+    <file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
   </files>
 </package>
diff --git a/src/wix.vsconfig b/src/wix.vsconfig
index f72cc5e4..8fb74dfc 100644
--- a/src/wix.vsconfig
+++ b/src/wix.vsconfig
@@ -1,6 +1,5 @@
 {
   "version": "1.0",
   "components": [
-    "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre"
   ]
 }