aboutsummaryrefslogtreecommitdiff
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
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.
-rw-r--r--README.md5
-rw-r--r--src/Directory.Build.props2
-rw-r--r--src/Directory.vcxproj.props3
-rw-r--r--src/api/burn/balutil/balutil.nuspec6
-rw-r--r--src/api/burn/bextutil/bextutil.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
8 files changed, 16 insertions, 19 deletions
diff --git a/README.md b/README.md
index aabec075..66add6c5 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,8 @@ This repository contains the WiX Toolset v4 codebase.
24| :-------------------- | 24| :-------------------- |
25| .NET Framework 4.7.2 SDK | 25| .NET Framework 4.7.2 SDK |
26| .NET Framework 4.7.2 targeting pack | 26| .NET Framework 4.7.2 targeting pack |
27| MSVC v141 - VS 2017 C++ ARM64 build tools (v14.16) | 27| .NET Framework 4.6.2 targeting pack |
28| MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16) | 28| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) |
29| MSVC v143 - VS 2022 C++ ARM64 build tools (Latest) |
30| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) | 29| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) |
31 30
32- [Download the latest nuget.exe command-line tool](https://www.nuget.org/downloads) and put it in a directory on the path. 31- [Download the latest nuget.exe command-line tool](https://www.nuget.org/downloads) and put it in a directory on the path.
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/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 @@
22 <file src="$projectFolder$\build\$id$.props" target="build\" /> 22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
24 <file src="$projectFolder$\inc\*" target="build\native\include" /> 24 <file src="$projectFolder$\inc\*" target="build\native\include" />
25 <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v143\x86\balutil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" /> 26 <file src="..\..\v143\x64\balutil.lib" target="build\native\v14\x64" />
27 <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" /> 27 <file src="..\..\v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
28 </files> 28 </files>
29</package> 29</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 @@
22 <file src="$projectFolder$\build\$id$.props" target="build\" /> 22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
24 <file src="$projectFolder$\inc\*" target="build\native\include" /> 24 <file src="$projectFolder$\inc\*" target="build\native\include" />
25 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" /> 26 <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
27 <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" /> 27 <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
28 </files> 28 </files>
29</package> 29</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 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>
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}