From 667ee81ee0263314b4546f5598efc66fe84c08b7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 5 Dec 2021 21:16:28 -0500
Subject: Build with VS2022, which is now required.

- Use VS2022/v143 libraries exclusively. C++ compatibility works.
---
 .../burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj    |  8 ++++----
 .../burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec    | 12 ++++++------
 src/api/burn/balutil/balutil.nuspec                        | 11 +++--------
 src/api/burn/balutil/balutil.vcxproj                       |  1 -
 src/api/burn/balutil/build/WixToolset.BalUtil.props        | 14 ++------------
 src/api/burn/bextutil/bextutil.nuspec                      | 11 +++--------
 src/api/burn/bextutil/bextutil.vcxproj                     |  1 -
 src/api/burn/bextutil/build/WixToolset.BextUtil.props      | 14 ++------------
 src/api/burn/burn.proj                                     | 14 +++-----------
 src/api/burn/mbanative/mbanative.vcxproj                   |  2 --
 10 files changed, 23 insertions(+), 65 deletions(-)

(limited to 'src/api')

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 ce8c7105..4161f7f0 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)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup Condition=" '$(NCrunch)'=='1' ">
-    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 </Project>
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
index a5e09ea9..504496ae 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -23,11 +23,11 @@
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
     <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
 
-    <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
-    <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
-    <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
-    <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
-    <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
-    <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
+    <file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
+    <file src="v143\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
+    <file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" />
+    <file src="v143\x64\mbanative.pdb" target="runtimes\win-x64\native" />
+    <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />
+    <file src="v143\x86\mbanative.pdb" target="runtimes\win-x86\native" />
   </files>
 </package>
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index 2474b2ea..d89dbe22 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -20,13 +20,8 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" />
-    <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" />
-    <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
-    <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" />
-    <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" />
-    <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
+    <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" />
   </files>
 </package>
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index 8f763324..42a86fd1 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.vcxproj
@@ -33,7 +33,6 @@
     <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <TargetName>balutil</TargetName>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
     <PackageId>WixToolset.BalUtil</PackageId>
diff --git a/src/api/burn/balutil/build/WixToolset.BalUtil.props b/src/api/burn/balutil/build/WixToolset.BalUtil.props
index 45b97f6a..b276574d 100644
--- a/src/api/burn/balutil/build/WixToolset.BalUtil.props
+++ b/src/api/burn/balutil/build/WixToolset.BalUtil.props
@@ -10,19 +10,9 @@
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index e75c4a43..747cb8b1 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -20,13 +20,8 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" />
-    <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" />
-    <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
-    <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" />
-    <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" />
-    <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
+    <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" />
   </files>
 </package>
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj
index cbb83b96..6af9cd56 100644
--- a/src/api/burn/bextutil/bextutil.vcxproj
+++ b/src/api/burn/bextutil/bextutil.vcxproj
@@ -33,7 +33,6 @@
     <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <TargetName>bextutil</TargetName>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Bundle Extension native utility library</Description>
     <PackageId>WixToolset.BextUtil</PackageId>
diff --git a/src/api/burn/bextutil/build/WixToolset.BextUtil.props b/src/api/burn/bextutil/build/WixToolset.BextUtil.props
index 60a2db54..dbaddb70 100644
--- a/src/api/burn/bextutil/build/WixToolset.BextUtil.props
+++ b/src/api/burn/bextutil/build/WixToolset.BextUtil.props
@@ -10,19 +10,9 @@
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj
index 0aa838bf..49bd2876 100644
--- a/src/api/burn/burn.proj
+++ b/src/api/burn/burn.proj
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
 <Project Sdk="Microsoft.Build.Traversal/3.0.23">
   <ItemGroup>
     <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
@@ -6,21 +9,10 @@
 
     <!-- Build -->
 
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
     <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
     <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
     <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
 
-    <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
-    <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
-    <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
-    <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
-    <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
-
     <!-- Let mbanative build balutil for latest toolset. -->
     <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
     <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj
index af02f34e..e6376ca7 100644
--- a/src/api/burn/mbanative/mbanative.vcxproj
+++ b/src/api/burn/mbanative/mbanative.vcxproj
@@ -32,11 +32,9 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>mbanative</TargetName>
     <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
-    <EnableSourceLink Condition=" '$(PlatformToolset)'=='v140' ">false</EnableSourceLink>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-- 
cgit v1.2.3-55-g6feb