aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2024-06-10 18:43:55 -0400
committerRob Mensching <rob@firegiant.com>2024-07-15 13:05:10 -0700
commite081c743d4d6e73bb6997aef9cd724dd255d5ba4 (patch)
treec267c04ca08985a7dcd0c4d45430fffbad547fe6
parent71dff4c5d70b0be54a2ad0e77514cf001d3ccbf4 (diff)
downloadwix-e081c743d4d6e73bb6997aef9cd724dd255d5ba4.tar.gz
wix-e081c743d4d6e73bb6997aef9cd724dd255d5ba4.tar.bz2
wix-e081c743d4d6e73bb6997aef9cd724dd255d5ba4.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
-rw-r--r--README.md2
-rw-r--r--src/Directory.Build.props2
-rw-r--r--src/Directory.vcxproj.props3
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec6
-rw-r--r--src/api/burn/bextutil/bextutil.nuspec6
-rw-r--r--src/ext/Bal/wixstdfn/wixstdfn.nuspec6
-rw-r--r--src/libs/dutil/WixToolset.DUtil/dutil.nuspec6
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec6
-rw-r--r--src/wix.vsconfig1
9 files changed, 17 insertions, 21 deletions
diff --git a/README.md b/README.md
index 7e55a3cc..f945ad23 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,6 @@ This repository contains the WiX Toolset codebase.
27| .NET Framework 4.7.2 SDK | 27| .NET Framework 4.7.2 SDK |
28| .NET Framework 4.7.2 targeting pack | 28| .NET Framework 4.7.2 targeting pack |
29| .NET Framework 4.6.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) |
32| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) | 30| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) |
33| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) | 31| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) |
34| Git for Windows | 32| Git for Windows |
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 @@
20 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> 20 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
21 21
22 <!-- This is C++-specific but used from managed projects to pick up native build artifacts. --> 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> 24 <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
25 <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset> 25 <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
26 26
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 @@
10 <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir> 10 <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
11 </PropertyGroup> 11 </PropertyGroup>
12 12
13 <!-- This is needed for v141 toolset, which doesn't understand `10.0` -->
14 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''"> 13 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
15 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> 14 <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
16 </PropertyGroup> 15 </PropertyGroup>
17 16
18 <PropertyGroup Condition=" '$(CLRSupport)'!='true' "> 17 <PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 3b42d53d..da1cda91 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -39,8 +39,8 @@
39 <file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" /> 39 <file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
40 <file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" 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" /> 41 <file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
42 <file src="v141\x86\balutil.lib" target="build\native\v14\x86" /> 42 <file src="v143\x86\balutil.lib" target="build\native\v14\x86" />
43 <file src="v141\x64\balutil.lib" target="build\native\v14\x64" /> 43 <file src="v143\x64\balutil.lib" target="build\native\v14\x64" />
44 <file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" /> 44 <file src="v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
45 </files> 45 </files>
46</package> 46</package>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 8d03da2f..30edc910 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -23,8 +23,8 @@
23 <file src="$projectFolder$\inc\*" target="build\native\include" /> 23 <file src="$projectFolder$\inc\*" target="build\native\include" />
24 <file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" 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" /> 25 <file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
26 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" /> 26 <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
27 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" /> 27 <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
28 <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" /> 28 <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
29 </files> 29 </files>
30</package> 30</package>
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
index 1924431e..975e52c8 100644
--- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -26,8 +26,8 @@
26 <file src="$projectFolder$\build\$id$.props" target="build\" /> 26 <file src="$projectFolder$\build\$id$.props" target="build\" />
27 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 27 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
28 <file src="$projectFolder$\inc\*" target="lib\native\include" /> 28 <file src="$projectFolder$\inc\*" target="lib\native\include" />
29 <file src="..\..\v141\x86\wixstdfn.lib" target="lib\native\v14\x86" /> 29 <file src="..\..\v143\x86\wixstdfn.lib" target="lib\native\v14\x86" />
30 <file src="..\..\v141\x64\wixstdfn.lib" target="lib\native\v14\x64" /> 30 <file src="..\..\v143\x64\wixstdfn.lib" target="lib\native\v14\x64" />
31 <file src="..\..\v141\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" /> 31 <file src="..\..\v143\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
32 </files> 32 </files>
33</package> 33</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 @@
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 e1fbde48..20329544 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>
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 @@
1{ 1{
2 "version": "1.0", 2 "version": "1.0",
3 "components": [ 3 "components": [
4 "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre"
5 ] 4 ]
6} 5}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 21:16:40 +0000