Skip to content

Commit eed1b5b

Browse files
committed
Build native code with VC v143 toolset only.
v143 output is compatible back to VS2017 (at least). Fixes wixtoolset/issues#8211.
1 parent 4946477 commit eed1b5b

File tree

9 files changed

+17
-21
lines changed

9 files changed

+17
-21
lines changed

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ This repository contains the WiX Toolset codebase.
2727
| .NET Framework 4.7.2 SDK |
2828
| .NET Framework 4.7.2 targeting pack |
2929
| .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) |
3230
| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) |
3331
| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) |
3432
| Git for Windows |

src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
2121

2222
<!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
23-
<WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset>
23+
<WixNativeSdkLibraryToolset>v143</WixNativeSdkLibraryToolset>
2424
<PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
2525
<PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
2626

src/Directory.vcxproj.props

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
1111
</PropertyGroup>
1212

13-
<!-- This is needed for v141 toolset, which doesn't understand `10.0` -->
1413
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
15-
<WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
14+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1615
</PropertyGroup>
1716

1817
<PropertyGroup Condition=" '$(CLRSupport)'!='true' ">

src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
4040
<file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
4141
<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" />
4545
</files>
4646
</package>

src/api/burn/bextutil/bextutil.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<file src="$projectFolder$\inc\*" target="build\native\include" />
2424
<file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
2525
<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" />
2929
</files>
3030
</package>

src/ext/Bal/wixstdfn/wixstdfn.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<file src="$projectFolder$\build\$id$.props" target="build\" />
2727
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
2828
<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" />
3232
</files>
3333
</package>

src/libs/dutil/WixToolset.DUtil/dutil.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<file src="$projectFolder$\build\$id$.props" target="build\" />
1919
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
2020
<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" />
2424
</files>
2525
</package>

src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<file src="$projectFolder$\build\$id$.props" target="build\" />
2222
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
2323
<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" />
2727
</files>
2828
</package>

src/wix.vsconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"version": "1.0",
33
"components": [
4-
"Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre"
54
]
65
}

0 commit comments

Comments
 (0)