From 667ee81ee0263314b4546f5598efc66fe84c08b7 Mon Sep 17 00:00:00 2001 From: Bob Arnson 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. --- .github/workflows/build.yml | 2 +- appveyor.yml | 2 +- src/Directory.vcxproj.props | 10 +++------- .../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 -- src/burn/engine/engine.vcxproj | 1 - src/burn/stub/stub.vcxproj | 1 - src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 1 - .../WixToolset.Dtf.Compression.Cab.csproj | 4 ++++ .../WixToolset.Dtf.Compression.Zip.csproj | 4 ++++ .../WixToolset.Dtf.Compression.csproj | 4 ++++ .../WixToolset.Dtf.Resources.csproj | 4 ++++ .../WixToolset.Dtf.WindowsInstaller.Linq.csproj | 4 ++++ .../WixToolset.Dtf.WindowsInstaller.Package.csproj | 4 ++++ .../WixToolset.Dtf.WindowsInstaller.csproj | 4 ++++ .../WixToolsetTests.Dtf.Compression.Cab.csproj | 12 ++++++++---- .../WixToolsetTests.Dtf.Compression.Zip.csproj | 12 ++++++++---- .../WixToolsetTests.Dtf.Compression.csproj | 12 ++++++++---- ...xToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj | 8 ++++++-- .../WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj | 12 ++++++++---- .../WixToolsetTests.Dtf.WindowsInstaller.csproj | 12 ++++++++---- src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj | 1 - src/ext/Bal/dnchost/dnchost.vcxproj | 1 - src/ext/Bal/mbahost/mbahost.vcxproj | 1 - .../test/examples/TestEngine/Example.TestEngine.vcxproj | 2 -- src/ext/Bal/wixstdba/wixstdba.vcxproj | 1 - src/ext/ComPlus/ca/complusca.vcxproj | 2 -- src/ext/Dependency/ca/dependencyca.vcxproj | 2 -- src/ext/DirectX/ca/directxca.vcxproj | 1 - src/ext/Firewall/ca/fwca.vcxproj | 1 - src/ext/Http/ca/httpca.vcxproj | 1 - src/ext/Iis/ca/iisca.vcxproj | 1 - src/ext/Msmq/ca/msmqca.vcxproj | 1 - src/ext/NetFx/ca/netfxca.vcxproj | 1 - src/ext/Sql/ca/sqlca.vcxproj | 1 - src/ext/UI/ca/uica.vcxproj | 1 - src/ext/Util/be/utilbe.vcxproj | 1 - src/ext/Util/ca/utilca.vcxproj | 1 - src/ext/VisualStudio/ca/vsca.vcxproj | 2 -- src/internal/SetBuildNumber/Directory.Packages.props.pp | 3 ++- .../build/WixBuildTools.TestSupport.Native.props | 1 - .../dutil/WixToolset.DUtil/build/WixToolset.DUtil.props | 14 ++------------ src/libs/dutil/WixToolset.DUtil/dutil.nuspec | 11 +++-------- src/libs/dutil/WixToolset.DUtil/dutil.vcxproj | 1 - src/libs/dutil/dutil.proj | 13 +++---------- .../WixToolset.WcaUtil/build/WixToolset.WcaUtil.props | 14 ++------------ src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec | 11 +++-------- src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj | 1 - src/libs/wcautil/wcautil.proj | 13 +++---------- src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj | 1 - src/samples/thmviewer/thmviewer.vcxproj | 1 - .../Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj | 1 - src/wix/wixnative/wixnative.vcxproj | 2 -- 61 files changed, 120 insertions(+), 190 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1438c662..c1f54de4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ env: jobs: build: name: Build - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/appveyor.yml b/appveyor.yml index fa0fec4e..8741026b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ branches: - master - develop -image: Visual Studio 2019 +image: Visual Studio 2022 version: 0.0.0.{build} configuration: Release diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props index 95f828ec..3cd406e4 100644 --- a/src/Directory.vcxproj.props +++ b/src/Directory.vcxproj.props @@ -8,6 +8,7 @@ $(Platform) $(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\ $(OutputPath)$(PlatformFolder)\ + v143 @@ -15,10 +16,6 @@ native,Version=v0.0 - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset @@ -35,8 +32,7 @@ true false Guard - -YlprecompDefine /w44263 - /Zc:threadSafeInit- %(AdditionalOptions) + /Zc:threadSafeInit- -YlprecompDefine /w44263 true @@ -53,7 +49,7 @@ true $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) + /IGNORE:4099 %(AdditionalOptions) 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 @@ - - + + - - + + 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 @@ - - - - - - + + + + + + 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 @@ - - - - - - - - + + + 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 @@ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB} StaticLibrary balutil - v142 MultiByte WiX Toolset Bootstrapper Application Layer native utility library WixToolset.BalUtil 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 @@ $(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories) - + - $(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies) 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 @@ - - - - - - - - + + + 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 @@ {06027492-1CB9-48BC-B31E-C1F9356ED07E} StaticLibrary bextutil - v142 MultiByte WiX Toolset Bundle Extension native utility library WixToolset.BextUtil 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 @@ $(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories) - + - $(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies) 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 @@ + + + @@ -6,21 +9,10 @@ - - - - - - - - - - - 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 @@ {665E0441-17F9-4105-B202-EDF274657F6E} DynamicLibrary - v142 Unicode mbanative mbanative.def - false diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index 0062df8c..ae28d728 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj @@ -33,7 +33,6 @@ {8119537D-E1D9-6591-D51A-49768A2F9C37} StaticLibrary engine - v142 Unicode Native component of WixToolset.Burn diff --git a/src/burn/stub/stub.vcxproj b/src/burn/stub/stub.vcxproj index e7bdf6e3..d73b9f49 100644 --- a/src/burn/stub/stub.vcxproj +++ b/src/burn/stub/stub.vcxproj @@ -34,7 +34,6 @@ Application Windows burn - v142 Unicode false Native component of WixToolset.Burn diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index 85481821..33e75da6 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj @@ -29,7 +29,6 @@ UnitTest ManagedCProj DynamicLibrary - v142 Unicode true false diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj index 08a88b30..bacfd90c 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj @@ -18,4 +18,8 @@ + + + + diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj index aa97019d..476b63b0 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj index 907e7a04..c3d36d29 100644 --- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj +++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj index 89bff841..411457a6 100644 --- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj +++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj @@ -9,4 +9,8 @@ Classes for reading and writing resource data in executable files true + + + + diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj index fbc85880..7aa376bb 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj index b3952177..9e0b1a40 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj @@ -15,4 +15,8 @@ + + + + diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj index 117a4114..324a7eed 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj @@ -22,4 +22,8 @@ + + + + diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj index ddcf68ac..9cd09e12 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj @@ -11,18 +11,18 @@ false v4.7.2 - + - + - + {45D81DAB-0559-4836-8106-CE9987FD4AB5} @@ -38,5 +38,9 @@ + + + + - + \ No newline at end of file diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj index 3e7fcb7e..4c7e48dc 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj @@ -11,16 +11,16 @@ false v4.7.2 - + - + - + {45D81DAB-0559-4836-8106-CE9987FD4AB5} @@ -36,5 +36,9 @@ + + + + - + \ No newline at end of file diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj index 83040938..9ca24363 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj @@ -10,20 +10,20 @@ false v4.7.2 - + - + - + {45D81DAB-0559-4836-8106-CE9987FD4AB5} @@ -31,5 +31,9 @@ + + + + - + \ No newline at end of file diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj index 6a053026..aa3389d9 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj @@ -11,7 +11,7 @@ false v4.7.2 - + @@ -26,6 +26,10 @@ WixToolsetTests.Dtf.WindowsInstaller + + + + - + \ No newline at end of file diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj index e7fbf28d..db3923aa 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj @@ -11,17 +11,17 @@ false v4.7.2 - + - + - + {85225597-5121-4361-8332-4E3246D5BBF5} @@ -37,5 +37,9 @@ + + + + - + \ No newline at end of file diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj index 1fedfe4e..d9aeae3b 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj @@ -11,7 +11,7 @@ false v4.7.2 - + @@ -19,14 +19,14 @@ - + - + {85225597-5121-4361-8332-4E3246D5BBF5} @@ -34,5 +34,9 @@ + + + + - + \ No newline at end of file diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index 6aac6943..6d6f78c8 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj @@ -32,7 +32,6 @@ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} DynamicLibrary - v142 Unicode BAFunctions bafunctions.def diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index 6bc89427..66c1f8d1 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj @@ -31,7 +31,6 @@ {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} DynamicLibrary - v142 Unicode dnchost dnchost.def diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj index 5edb2562..ababf19c 100644 --- a/src/ext/Bal/mbahost/mbahost.vcxproj +++ b/src/ext/Bal/mbahost/mbahost.vcxproj @@ -32,7 +32,6 @@ {12C87C77-3547-44F8-8134-29BC915CB19D} DynamicLibrary - v142 Unicode mbahost mbahost.def diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 39207d77..12abe976 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -34,9 +34,7 @@ Application Console Example.TestEngine - v142 Unicode - 10.0 diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index fba3e885..85d90e77 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj @@ -32,7 +32,6 @@ {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} DynamicLibrary - v142 Unicode WixStdBA wixstdba.def diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index 5a8b23cd..0bd490b1 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj @@ -24,12 +24,10 @@ {BDEF51ED-E242-4FA2-801A-01B127DF851A} DynamicLibrary - v142 Unicode complusca complusca.def WiX Toolset ComPlus CustomAction - 10.0 diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj index 9e31994b..b84321df 100644 --- a/src/ext/Dependency/ca/dependencyca.vcxproj +++ b/src/ext/Dependency/ca/dependencyca.vcxproj @@ -32,12 +32,10 @@ {B86AF46C-0F90-49CC-923F-A800B088D015} DynamicLibrary - v142 Unicode dependencyca wixdepca.def WiX Toolset Dependency CustomAction - 10.0 diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index 85ce0828..e2baa46a 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj @@ -32,7 +32,6 @@ {76542B28-0FFD-47D3-AD6A-D0F20FA875AC} DynamicLibrary - v142 Unicode directxca directx.def diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 38497d97..11170675 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj @@ -35,7 +35,6 @@ {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981} DynamicLibrary fwca - v142 Unicode fwca.def WiX Toolset Firewall CustomAction diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj index 3a17b3b0..2614275f 100644 --- a/src/ext/Http/ca/httpca.vcxproj +++ b/src/ext/Http/ca/httpca.vcxproj @@ -32,7 +32,6 @@ {90743805-C043-47C7-B5FF-8F5EE5C8A2DE} DynamicLibrary - v142 Unicode httpca wixhttpca.def diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj index d99ef4ab..de3ef83e 100644 --- a/src/ext/Iis/ca/iisca.vcxproj +++ b/src/ext/Iis/ca/iisca.vcxproj @@ -35,7 +35,6 @@ {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3} DynamicLibrary iisca - v142 Unicode iisca.def WiX Toolset Iis CustomAction diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj index 473624b4..b00cd88e 100644 --- a/src/ext/Msmq/ca/msmqca.vcxproj +++ b/src/ext/Msmq/ca/msmqca.vcxproj @@ -20,7 +20,6 @@ {CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D} DynamicLibrary msmqca - v142 Unicode msmqca.def WiX Toolset MSMQ CustomAction diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index 34332180..7b0f731a 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.vcxproj @@ -33,7 +33,6 @@ {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981} DynamicLibrary netfxca - v142 Unicode netfxca.def WiX Toolset .NET Framework CustomAction diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index 01eae1fb..9a5df8cf 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.vcxproj @@ -33,7 +33,6 @@ {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935} DynamicLibrary sqlca - v142 Unicode sqlca.def WiX Toolset Sql CustomAction diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj index 1b145192..e06b7572 100644 --- a/src/ext/UI/ca/uica.vcxproj +++ b/src/ext/UI/ca/uica.vcxproj @@ -17,7 +17,6 @@ {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981} DynamicLibrary uica - v142 MultiByte uica.def WiX Toolset UI CustomAction diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index 5e5a44d3..8e139812 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj @@ -33,7 +33,6 @@ {630C1EE7-2517-4A8C-83E3-DA1150308B58} DynamicLibrary utilbe - v142 Unicode utilbe.def WiX Toolset Util BundleExtension diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj index f090181b..b3998b6e 100644 --- a/src/ext/Util/ca/utilca.vcxproj +++ b/src/ext/Util/ca/utilca.vcxproj @@ -33,7 +33,6 @@ {076018F7-19BD-423A-ABBF-229273DA08D8} DynamicLibrary utilca - v142 Unicode utilca.def WiX Toolset Util CustomAction diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index 0b838b82..4636204f 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj @@ -25,11 +25,9 @@ {45308B85-0628-4978-8FC8-6AD9E1AD5949} DynamicLibrary vsca - v142 Unicode vsca.def WiX Toolset VS CustomAction - 10.0 diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 37b2d398..65496a36 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -42,7 +42,8 @@ - + + diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props index e6b5997f..c4e7b7b3 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props @@ -8,7 +8,6 @@ - v142 v4.7.2 diff --git a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props index 35749be8..4e773137 100644 --- a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props +++ b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props @@ -10,19 +10,9 @@ $(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories) - + - $(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies) diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec index fef60013..3c44dfd2 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec +++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec @@ -16,13 +16,8 @@ - - - - - - - - + + + diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj index 3ab8285f..cf38e8ae 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj +++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj @@ -34,7 +34,6 @@ StaticLibrary dutil true - v142 MultiByte WiX Toolset native library foundation WixToolset.DUtil diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil.proj index 9f4d884d..90d66440 100644 --- a/src/libs/dutil/dutil.proj +++ b/src/libs/dutil/dutil.proj @@ -1,15 +1,8 @@ - - - - - - - - - - + + + diff --git a/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props b/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props index fb73a680..e0147b5d 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props +++ b/src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props @@ -10,19 +10,9 @@ $(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories) - + - $(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies) diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec index b9547a8b..2a03f879 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec @@ -19,13 +19,8 @@ - - - - - - - - + + + diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj index 377358ef..234020bc 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj @@ -34,7 +34,6 @@ StaticLibrary wcautil true - v142 MultiByte WiX Toolset Custom Action native utility library WixToolset.WcaUtil diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil.proj index 839c63a4..ae0ebc08 100644 --- a/src/libs/wcautil/wcautil.proj +++ b/src/libs/wcautil/wcautil.proj @@ -1,15 +1,8 @@ - - - - - - - - - - + + + diff --git a/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj index aeaaa776..4684d6e0 100644 --- a/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj +++ b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj @@ -24,7 +24,6 @@ {55D5BA28-D427-4F53-80C2-FE9EF23C1553} DynamicLibrary SfxCA - v142 Unicode EntryPoints.def diff --git a/src/samples/thmviewer/thmviewer.vcxproj b/src/samples/thmviewer/thmviewer.vcxproj index 41cd9dc5..180a18c6 100644 --- a/src/samples/thmviewer/thmviewer.vcxproj +++ b/src/samples/thmviewer/thmviewer.vcxproj @@ -17,7 +17,6 @@ {95228C13-97F5-484A-B4A2-ECF4618B0881} Win32Proj Application - v142 Unicode WiX Toolset Theme Viewer diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj index 8e7e9bd9..d938b0c9 100644 --- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj +++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj @@ -30,7 +30,6 @@ {565E99AE-975F-4F26-8A6E-852603386A80} DynamicLibrary - v142 Unicode BafThmUtilTesting BafThmUtilTesting.def diff --git a/src/wix/wixnative/wixnative.vcxproj b/src/wix/wixnative/wixnative.vcxproj index abe9a38e..1dac36e2 100644 --- a/src/wix/wixnative/wixnative.vcxproj +++ b/src/wix/wixnative/wixnative.vcxproj @@ -32,12 +32,10 @@ {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF} Application - v142 Unicode Console wixnative WiX Native Processing - 10.0 -- cgit v1.2.3-55-g6feb