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.
Bob Arnson committed
Jun 10, 2024 at 18:43 UTC
eed1b5bbfb49d2425417bc342ecabe9edc206cdf
9 files changed
+17
-21
README.md
-2
@@ -27,8 +27,6 @@ This repository contains the WiX Toolset codebase.
27
| .NET Framework 4.7.2 SDK |
28
| .NET Framework 4.7.2 targeting pack |
29
| .NET Framework 4.6.2 targeting pack |
30
-| MSVC v141 - VS 2017 C++ ARM64 build tools (v14.16) |
31
-| MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16) |
30
| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) |
31
| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) |
32
| Git for Windows |
src/Directory.Build.props
+1
-1
@@ -20,7 +20,7 @@
20
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
21
22
<!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
23
- <WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset>
23
+ <WixNativeSdkLibraryToolset>v143</WixNativeSdkLibraryToolset>
24
<PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
25
<PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
26
src/Directory.vcxproj.props
+1
-2
@@ -10,9 +10,8 @@
10
<OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
11
</PropertyGroup>
12
13
- <!-- This is needed for v141 toolset, which doesn't understand `10.0` -->
13
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
15
- <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
14
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
15
</PropertyGroup>
16
17
<PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+3
-3
@@ -39,8 +39,8 @@
39
<file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
40
<file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
41
<file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
42
- <file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
43
- <file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
44
- <file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
42
+ <file src="v143\x86\balutil.lib" target="build\native\v14\x86" />
43
+ <file src="v143\x64\balutil.lib" target="build\native\v14\x64" />
44
+ <file src="v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
45
</files>
46
</package>
src/api/burn/bextutil/bextutil.nuspec
+3
-3
@@ -23,8 +23,8 @@
23
<file src="$projectFolder$\inc\*" target="build\native\include" />
24
<file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
25
<file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
26
- <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
27
- <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
28
- <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
26
+ <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
27
+ <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
28
+ <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
29
</files>
30
</package>
src/ext/Bal/wixstdfn/wixstdfn.nuspec
+3
-3
@@ -26,8 +26,8 @@
26
<file src="$projectFolder$\build\$id$.props" target="build\" />
27
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
28
<file src="$projectFolder$\inc\*" target="lib\native\include" />
29
- <file src="..\..\v141\x86\wixstdfn.lib" target="lib\native\v14\x86" />
30
- <file src="..\..\v141\x64\wixstdfn.lib" target="lib\native\v14\x64" />
31
- <file src="..\..\v141\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
29
+ <file src="..\..\v143\x86\wixstdfn.lib" target="lib\native\v14\x86" />
30
+ <file src="..\..\v143\x64\wixstdfn.lib" target="lib\native\v14\x64" />
31
+ <file src="..\..\v143\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
32
</files>
33
</package>
src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+3
-3
@@ -18,8 +18,8 @@
18
<file src="$projectFolder$\build\$id$.props" target="build\" />
19
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20
<file src="$projectFolder$\inc\*" target="build\native\include" />
21
- <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
22
- <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
23
- <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" />
21
+ <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
22
+ <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
23
+ <file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
24
</files>
25
</package>
src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+3
-3
@@ -21,8 +21,8 @@
21
<file src="$projectFolder$\build\$id$.props" target="build\" />
22
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23
<file src="$projectFolder$\inc\*" target="build\native\include" />
24
- <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
25
- <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
26
- <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
24
+ <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
25
+ <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
26
+ <file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
27
</files>
28
</package>
src/wix.vsconfig
-1
@@ -1,6 +1,5 @@
1
{
2
"version": "1.0",
3
"components": [
4
- "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre"
4
]
5
}