From 5bb1c768a8124505c87fc1db3f702675b50d54ab Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 12 Dec 2021 23:26:03 -0500
Subject: Use `v143` toolset except `v141` for libs.

---
 src/Directory.Build.props                                   | 5 +++++
 src/Directory.vcxproj.props                                 | 6 +++++-
 src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | 8 ++++----
 src/api/burn/balutil/balutil.nuspec                         | 6 +++---
 src/api/burn/bextutil/bextutil.nuspec                       | 6 +++---
 src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj   | 2 +-
 src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | 2 +-
 src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj             | 2 +-
 src/libs/dutil/WixToolset.DUtil/dutil.nuspec                | 6 +++---
 src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec          | 6 +++---
 10 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8969b436..da099c3d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -17,6 +17,11 @@
     <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
 
+    <!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
+    <WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset>
+    <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
+    <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
+
     <Authors>WiX Toolset Team</Authors>
     <Company>WiX Toolset</Company>
     <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
index 3cd406e4..0efe2cbb 100644
--- a/src/Directory.vcxproj.props
+++ b/src/Directory.vcxproj.props
@@ -8,7 +8,11 @@
     <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder>
     <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\</IntDir>
     <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
-    <PlatformToolset>v143</PlatformToolset>
+  </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>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 4161f7f0..74cbe551 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
-    <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(BaseOutputPath)$(Configuration)\$(PlatformToolset)\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(BaseOutputPath)$(Configuration)\$(PlatformToolset)\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup Condition=" '$(NCrunch)'=='1' ">
-    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\$(PlatformToolset)\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\$(PlatformToolset)\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 </Project>
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index d89dbe22..19c160cf 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -20,8 +20,8 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <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" />
+    <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" />
   </files>
 </package>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 747cb8b1..137c39e1 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -20,8 +20,8 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <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" />
+    <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" />
   </files>
 </package>
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index 345c324c..323561b9 100644
--- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -32,7 +32,7 @@
 
   <PropertyGroup>
     <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
index fc31ce57..0fd29eea 100644
--- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
@@ -31,7 +31,7 @@
 
   <PropertyGroup>
     <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
index 33e75da6..c038dccd 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
@@ -39,7 +39,7 @@
 
   <PropertyGroup>
     <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 3c44dfd2..d68183cd 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -16,8 +16,8 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <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" />
+    <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" />
   </files>
 </package>
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index 2a03f879..8aa9827e 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -19,8 +19,8 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <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" />
+    <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" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb