@joebigelow / wix-1 / commits / 667ee81e

Build with VS2022, which is now required.

- Use VS2022/v143 libraries exclusively. C++ compatibility works.

Bob Arnson committed Dec 5, 2021 at 21:16 UTC 667ee81ee0263314b4546f5598efc66fe84c08b7
61 files changed +120 -190
.github/workflows/build.yml
+1 -1
@@ -19,7 +19,7 @@ env:
19 jobs:
20 build:
21 name: Build
22 - runs-on: windows-latest
22 + runs-on: windows-2022
23 steps:
24 - name: Checkout code
25 uses: actions/checkout@v2
appveyor.yml
+1 -1
@@ -5,7 +5,7 @@ branches:
5 - master
6 - develop
7
8 -image: Visual Studio 2019
8 +image: Visual Studio 2022
9
10 version: 0.0.0.{build}
11 configuration: Release
src/Directory.vcxproj.props
+3 -7
@@ -8,6 +8,7 @@
8 <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder>
9 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\</IntDir>
10 <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
11 + <PlatformToolset>v143</PlatformToolset>
12 </PropertyGroup>
13
14 <PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
@@ -15,10 +16,6 @@
16 <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
17 </PropertyGroup>
18
18 - <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
19 - <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
20 - </PropertyGroup>
21 -
19 <PropertyGroup>
20 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
21 </PropertyGroup>
@@ -35,8 +32,7 @@
32 <TreatWarningAsError>true</TreatWarningAsError>
33 <ExceptionHandling>false</ExceptionHandling>
34 <ControlFlowGuard>Guard</ControlFlowGuard>
38 - <AdditionalOptions>-YlprecompDefine /w44263</AdditionalOptions>
39 - <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
35 + <AdditionalOptions>/Zc:threadSafeInit- -YlprecompDefine /w44263</AdditionalOptions>
36 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
37 </ClCompile>
38 <ResourceCompile>
@@ -53,7 +49,7 @@
49 <GenerateDebugInformation>true</GenerateDebugInformation>
50 <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
51 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
56 - <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
52 + <AdditionalOptions>/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
53 </Link>
54 </ItemDefinitionGroup>
55
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+4 -4
@@ -18,11 +18,11 @@
18 </ItemGroup>
19
20 <ItemGroup Condition=" '$(NCrunch)'=='' ">
21 - <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
22 - <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
21 + <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
22 + <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
23 </ItemGroup>
24 <ItemGroup Condition=" '$(NCrunch)'=='1' ">
25 - <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
26 - <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
25 + <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
26 + <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
27 </ItemGroup>
28 </Project>
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+6 -6
@@ -23,11 +23,11 @@
23 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
24 <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
25
26 - <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
27 - <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
28 - <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
29 - <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
30 - <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
31 - <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
26 + <file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
27 + <file src="v143\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
28 + <file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" />
29 + <file src="v143\x64\mbanative.pdb" target="runtimes\win-x64\native" />
30 + <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />
31 + <file src="v143\x86\mbanative.pdb" target="runtimes\win-x86\native" />
32 </files>
33 </package>
src/api/burn/balutil/balutil.nuspec
+3 -8
@@ -20,13 +20,8 @@
20 <files>
21 <file src="$projectFolder$\build\$id$.props" target="build\" />
22 <file src="$projectFolder$\inc\*" target="build\native\include" />
23 - <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" />
24 - <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" />
25 - <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" />
26 - <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" />
27 - <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
28 - <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" />
29 - <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" />
30 - <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
23 + <file src="..\..\v143\x86\balutil.lib" target="build\native\v14\x86" />
24 + <file src="..\..\v143\x64\balutil.lib" target="build\native\v14\x64" />
25 + <file src="..\..\v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
26 </files>
27 </package>
src/api/burn/balutil/balutil.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid>
34 <ConfigurationType>StaticLibrary</ConfigurationType>
35 <TargetName>balutil</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>MultiByte</CharacterSet>
37 <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
38 <PackageId>WixToolset.BalUtil</PackageId>
src/api/burn/balutil/build/WixToolset.BalUtil.props
+2 -12
@@ -10,19 +10,9 @@
10 <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11 </ResourceCompile>
12 </ItemDefinitionGroup>
13 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
13 + <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
14 <Link>
15 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 - </Link>
17 - </ItemDefinitionGroup>
18 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19 - <Link>
20 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 - </Link>
22 - </ItemDefinitionGroup>
23 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24 - <Link>
25 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15 + <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 </Link>
17 </ItemDefinitionGroup>
18 </Project>
src/api/burn/bextutil/bextutil.nuspec
+3 -8
@@ -20,13 +20,8 @@
20 <files>
21 <file src="$projectFolder$\build\$id$.props" target="build\" />
22 <file src="$projectFolder$\inc\*" target="build\native\include" />
23 - <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" />
24 - <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" />
25 - <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" />
26 - <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" />
27 - <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
28 - <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" />
29 - <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" />
30 - <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
23 + <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
24 + <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
25 + <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
26 </files>
27 </package>
src/api/burn/bextutil/bextutil.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid>
34 <ConfigurationType>StaticLibrary</ConfigurationType>
35 <TargetName>bextutil</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>MultiByte</CharacterSet>
37 <Description>WiX Toolset Bundle Extension native utility library</Description>
38 <PackageId>WixToolset.BextUtil</PackageId>
src/api/burn/bextutil/build/WixToolset.BextUtil.props
+2 -12
@@ -10,19 +10,9 @@
10 <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11 </ResourceCompile>
12 </ItemDefinitionGroup>
13 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
13 + <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
14 <Link>
15 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 - </Link>
17 - </ItemDefinitionGroup>
18 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19 - <Link>
20 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 - </Link>
22 - </ItemDefinitionGroup>
23 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24 - <Link>
25 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15 + <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 </Link>
17 </ItemDefinitionGroup>
18 </Project>
src/api/burn/burn.proj
+3 -11
@@ -1,3 +1,6 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<!-- 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. -->
3 +
4 <Project Sdk="Microsoft.Build.Traversal/3.0.23">
5 <ItemGroup>
6 <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
@@ -6,21 +9,10 @@
9
10 <!-- Build -->
11
9 - <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
10 - <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
11 - <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
12 - <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
13 - <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
12 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
13 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
14 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
15
18 - <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
19 - <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
20 - <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
21 - <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
22 - <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
23 -
16 <!-- Let mbanative build balutil for latest toolset. -->
17 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
18 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
src/api/burn/mbanative/mbanative.vcxproj
-2
@@ -32,11 +32,9 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>mbanative</TargetName>
37 <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
39 - <EnableSourceLink Condition=" '$(PlatformToolset)'=='v140' ">false</EnableSourceLink>
38 </PropertyGroup>
39
40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/burn/engine/engine.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{8119537D-E1D9-6591-D51A-49768A2F9C37}</ProjectGuid>
34 <ConfigurationType>StaticLibrary</ConfigurationType>
35 <TargetName>engine</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>Unicode</CharacterSet>
37 <Description>Native component of WixToolset.Burn</Description>
38 </PropertyGroup>
src/burn/stub/stub.vcxproj
-1
@@ -34,7 +34,6 @@
34 <ConfigurationType>Application</ConfigurationType>
35 <ProjectSubSystem>Windows</ProjectSubSystem>
36 <TargetName>burn</TargetName>
37 - <PlatformToolset>v142</PlatformToolset>
37 <CharacterSet>Unicode</CharacterSet>
38 <GenerateManifest>false</GenerateManifest>
39 <Description>Native component of WixToolset.Burn</Description>
src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
-1
@@ -29,7 +29,6 @@
29 <RootNamespace>UnitTest</RootNamespace>
30 <Keyword>ManagedCProj</Keyword>
31 <ConfigurationType>DynamicLibrary</ConfigurationType>
32 - <PlatformToolset>v142</PlatformToolset>
32 <CharacterSet>Unicode</CharacterSet>
33 <CLRSupport>true</CLRSupport>
34 <SignOutput>false</SignOutput>
src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
+4
@@ -18,4 +18,8 @@
18 <ItemGroup>
19 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
20 </ItemGroup>
21 +
22 + <ItemGroup>
23 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
24 + </ItemGroup>
25 </Project>
src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
+4
@@ -13,4 +13,8 @@
13 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
15 </ItemGroup>
16 +
17 + <ItemGroup>
18 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 + </ItemGroup>
20 </Project>
src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
+4
@@ -13,4 +13,8 @@
13 <ItemGroup>
14 <None Include="Compression.cd" />
15 </ItemGroup>
16 +
17 + <ItemGroup>
18 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 + </ItemGroup>
20 </Project>
src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
+4
@@ -9,4 +9,8 @@
9 <Description>Classes for reading and writing resource data in executable files</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
12 +
13 + <ItemGroup>
14 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
15 + </ItemGroup>
16 </Project>
src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
+4
@@ -13,4 +13,8 @@
13 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
15 </ItemGroup>
16 +
17 + <ItemGroup>
18 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 + </ItemGroup>
20 </Project>
src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
+4
@@ -15,4 +15,8 @@
15 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
16 <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
17 </ItemGroup>
18 +
19 + <ItemGroup>
20 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
21 + </ItemGroup>
22 </Project>
src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
+4
@@ -22,4 +22,8 @@
22 <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
23 <Reference Include="System.Configuration" />
24 </ItemGroup>
25 +
26 + <ItemGroup>
27 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
28 + </ItemGroup>
29 </Project>
src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
+8 -4
@@ -11,18 +11,18 @@
11 <SignOutput>false</SignOutput>
12 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13 </PropertyGroup>
14 -
14 +
15 <ItemGroup>
16 <Compile Include="CabTest.cs" />
17 </ItemGroup>
18 -
18 +
19 <ItemGroup>
20 <Reference Include="System" />
21 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
22 <Reference Include="System.Data" />
23 <Reference Include="System.Xml" />
24 </ItemGroup>
25 -
25 +
26 <ItemGroup>
27 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
28 <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
@@ -38,5 +38,9 @@
38 </ProjectReference>
39 </ItemGroup>
40
41 + <ItemGroup>
42 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
43 + </ItemGroup>
44 +
45 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
42 -</Project>
46 +</Project>
\ No newline at end of file
src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
+8 -4
@@ -11,16 +11,16 @@
11 <SignOutput>false</SignOutput>
12 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13 </PropertyGroup>
14 -
14 +
15 <ItemGroup>
16 <Compile Include="ZipTest.cs" />
17 </ItemGroup>
18 -
18 +
19 <ItemGroup>
20 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
21 <Reference Include="System" />
22 </ItemGroup>
23 -
23 +
24 <ItemGroup>
25 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
26 <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
@@ -36,5 +36,9 @@
36 </ProjectReference>
37 </ItemGroup>
38
39 + <ItemGroup>
40 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
41 + </ItemGroup>
42 +
43 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
40 -</Project>
44 +</Project>
\ No newline at end of file
src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
+8 -4
@@ -10,20 +10,20 @@
10 <SignOutput>false</SignOutput>
11 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12 </PropertyGroup>
13 -
13 +
14 <ItemGroup>
15 <Compile Include="CompressionTestUtil.cs" />
16 <Compile Include="MisbehavingStreamContext.cs" />
17 <Compile Include="OptionStreamContext.cs" />
18 </ItemGroup>
19 -
19 +
20 <ItemGroup>
21 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
22 <Reference Include="System" />
23 <Reference Include="System.Data" />
24 <Reference Include="System.Xml" />
25 </ItemGroup>
26 -
26 +
27 <ItemGroup>
28 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
29 <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
@@ -31,5 +31,9 @@
31 </ProjectReference>
32 </ItemGroup>
33
34 + <ItemGroup>
35 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
36 + </ItemGroup>
37 +
38 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
35 -</Project>
39 +</Project>
\ No newline at end of file
src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
+6 -2
@@ -11,7 +11,7 @@
11 <SignOutput>false</SignOutput>
12 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13 </PropertyGroup>
14 -
14 +
15 <ItemGroup>
16 <Compile Include="CustomActionTest.cs" />
17 </ItemGroup>
@@ -26,6 +26,10 @@
26 <Name>WixToolsetTests.Dtf.WindowsInstaller</Name>
27 </ProjectReference>
28 </ItemGroup>
29 +
30 + <ItemGroup>
31 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
32 + </ItemGroup>
33
34 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
31 -</Project>
35 +</Project>
\ No newline at end of file
src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
+8 -4
@@ -11,17 +11,17 @@
11 <SignOutput>false</SignOutput>
12 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13 </PropertyGroup>
14 -
14 +
15 <ItemGroup>
16 <Compile Include="LinqTest.cs" />
17 </ItemGroup>
18 -
18 +
19 <ItemGroup>
20 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
21 <Reference Include="System" />
22 <Reference Include="System.Core" />
23 </ItemGroup>
24 -
24 +
25 <ItemGroup>
26 <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
27 <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project>
@@ -37,5 +37,9 @@
37 </ProjectReference>
38 </ItemGroup>
39
40 + <ItemGroup>
41 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
42 + </ItemGroup>
43 +
44 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
41 -</Project>
45 +</Project>
\ No newline at end of file
src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
+8 -4
@@ -11,7 +11,7 @@
11 <SignOutput>false</SignOutput>
12 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13 </PropertyGroup>
14 -
14 +
15 <ItemGroup>
16 <Compile Include="EmbeddedExternalUI.cs" />
17 <Compile Include="Schema.cs" />
@@ -19,14 +19,14 @@
19 <Compile Include="WindowsInstallerTransactions.cs" />
20 <Compile Include="WindowsInstallerUtils.cs" />
21 </ItemGroup>
22 -
22 +
23 <ItemGroup>
24 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
25 <Reference Include="System" />
26 <Reference Include="System.Windows.Forms" />
27 <Reference Include="System.Xml" />
28 </ItemGroup>
29 -
29 +
30 <ItemGroup>
31 <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
32 <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project>
@@ -34,5 +34,9 @@
34 </ProjectReference>
35 </ItemGroup>
36
37 + <ItemGroup>
38 + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
39 + </ItemGroup>
40 +
41 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
38 -</Project>
42 +</Project>
\ No newline at end of file
src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj
-1
@@ -32,7 +32,6 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>BAFunctions</TargetName>
37 <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
src/ext/Bal/dnchost/dnchost.vcxproj
-1
@@ -31,7 +31,6 @@
31 <PropertyGroup Label="Globals">
32 <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid>
33 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 - <PlatformToolset>v142</PlatformToolset>
34 <CharacterSet>Unicode</CharacterSet>
35 <TargetName>dnchost</TargetName>
36 <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile>
src/ext/Bal/mbahost/mbahost.vcxproj
-1
@@ -32,7 +32,6 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>mbahost</TargetName>
37 <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile>
src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
-2
@@ -34,9 +34,7 @@
34 <ConfigurationType>Application</ConfigurationType>
35 <ProjectSubSystem>Console</ProjectSubSystem>
36 <TargetName>Example.TestEngine</TargetName>
37 - <PlatformToolset>v142</PlatformToolset>
37 <CharacterSet>Unicode</CharacterSet>
39 - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
38 </PropertyGroup>
39
40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/ext/Bal/wixstdba/wixstdba.vcxproj
-1
@@ -32,7 +32,6 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>WixStdBA</TargetName>
37 <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile>
src/ext/ComPlus/ca/complusca.vcxproj
-2
@@ -24,12 +24,10 @@
24 <PropertyGroup Label="Globals">
25 <ProjectGuid>{BDEF51ED-E242-4FA2-801A-01B127DF851A}</ProjectGuid>
26 <ConfigurationType>DynamicLibrary</ConfigurationType>
27 - <PlatformToolset>v142</PlatformToolset>
27 <CharacterSet>Unicode</CharacterSet>
28 <TargetName>complusca</TargetName>
29 <ProjectModuleDefinitionFile>complusca.def</ProjectModuleDefinitionFile>
30 <Description>WiX Toolset ComPlus CustomAction</Description>
32 - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
31 </PropertyGroup>
32
33 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/ext/Dependency/ca/dependencyca.vcxproj
-2
@@ -32,12 +32,10 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>dependencyca</TargetName>
37 <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile>
38 <Description>WiX Toolset Dependency CustomAction</Description>
40 - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
39 </PropertyGroup>
40
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/ext/DirectX/ca/directxca.vcxproj
-1
@@ -32,7 +32,6 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>directxca</TargetName>
37 <ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile>
src/ext/Firewall/ca/fwca.vcxproj
-1
@@ -35,7 +35,6 @@
35 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
36 <ConfigurationType>DynamicLibrary</ConfigurationType>
37 <TargetName>fwca</TargetName>
38 - <PlatformToolset>v142</PlatformToolset>
38 <CharacterSet>Unicode</CharacterSet>
39 <ProjectModuleDefinitionFile>fwca.def</ProjectModuleDefinitionFile>
40 <Description>WiX Toolset Firewall CustomAction</Description>
src/ext/Http/ca/httpca.vcxproj
-1
@@ -32,7 +32,6 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <TargetName>httpca</TargetName>
37 <ProjectModuleDefinitionFile>wixhttpca.def</ProjectModuleDefinitionFile>
src/ext/Iis/ca/iisca.vcxproj
-1
@@ -35,7 +35,6 @@
35 <ProjectGuid>{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}</ProjectGuid>
36 <ConfigurationType>DynamicLibrary</ConfigurationType>
37 <TargetName>iisca</TargetName>
38 - <PlatformToolset>v142</PlatformToolset>
38 <CharacterSet>Unicode</CharacterSet>
39 <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile>
40 <Description>WiX Toolset Iis CustomAction</Description>
src/ext/Msmq/ca/msmqca.vcxproj
-1
@@ -20,7 +20,6 @@
20 <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid>
21 <ConfigurationType>DynamicLibrary</ConfigurationType>
22 <TargetName>msmqca</TargetName>
23 - <PlatformToolset>v142</PlatformToolset>
23 <CharacterSet>Unicode</CharacterSet>
24 <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile>
25 <Description>WiX Toolset MSMQ CustomAction</Description>
src/ext/NetFx/ca/netfxca.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <TargetName>netfxca</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>Unicode</CharacterSet>
37 <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile>
38 <Description>WiX Toolset .NET Framework CustomAction</Description>
src/ext/Sql/ca/sqlca.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <TargetName>sqlca</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>Unicode</CharacterSet>
37 <ProjectModuleDefinitionFile>sqlca.def</ProjectModuleDefinitionFile>
38 <Description>WiX Toolset Sql CustomAction</Description>
src/ext/UI/ca/uica.vcxproj
-1
@@ -17,7 +17,6 @@
17 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
18 <ConfigurationType>DynamicLibrary</ConfigurationType>
19 <TargetName>uica</TargetName>
20 - <PlatformToolset>v142</PlatformToolset>
20 <CharacterSet>MultiByte</CharacterSet>
21 <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile>
22 <Description>WiX Toolset UI CustomAction</Description>
src/ext/Util/be/utilbe.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <TargetName>utilbe</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>Unicode</CharacterSet>
37 <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile>
38 <Description>WiX Toolset Util BundleExtension</Description>
src/ext/Util/ca/utilca.vcxproj
-1
@@ -33,7 +33,6 @@
33 <ProjectGuid>{076018F7-19BD-423A-ABBF-229273DA08D8}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <TargetName>utilca</TargetName>
36 - <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>Unicode</CharacterSet>
37 <ProjectModuleDefinitionFile>utilca.def</ProjectModuleDefinitionFile>
38 <Description>WiX Toolset Util CustomAction</Description>
src/ext/VisualStudio/ca/vsca.vcxproj
-2
@@ -25,11 +25,9 @@
25 <ProjectGuid>{45308B85-0628-4978-8FC8-6AD9E1AD5949}</ProjectGuid>
26 <ConfigurationType>DynamicLibrary</ConfigurationType>
27 <TargetName>vsca</TargetName>
28 - <PlatformToolset>v142</PlatformToolset>
28 <CharacterSet>Unicode</CharacterSet>
29 <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile>
30 <Description>WiX Toolset VS CustomAction</Description>
32 - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
31 </PropertyGroup>
32
33 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/internal/SetBuildNumber/Directory.Packages.props.pp
+2 -1
@@ -42,7 +42,8 @@
42 <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" />
43
44 <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
45 - <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.0.4492" />
45 + <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
46 + <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" />
47 <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
48
49 <PackageVersion Include="NuGet.Credentials" Version="5.6.0" />
src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
-1
@@ -8,7 +8,6 @@
8 <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" />
9 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
10 <PropertyGroup>
11 - <PlatformToolset>v142</PlatformToolset>
11 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12 </PropertyGroup>
13 </Project>
src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
+2 -12
@@ -10,19 +10,9 @@
10 <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11 </ResourceCompile>
12 </ItemDefinitionGroup>
13 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
13 + <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
14 <Link>
15 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 - </Link>
17 - </ItemDefinitionGroup>
18 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19 - <Link>
20 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 - </Link>
22 - </ItemDefinitionGroup>
23 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24 - <Link>
25 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15 + <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 </Link>
17 </ItemDefinitionGroup>
18 </Project>
src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+3 -8
@@ -16,13 +16,8 @@
16 <files>
17 <file src="$projectFolder$\build\$id$.props" target="build\" />
18 <file src="$projectFolder$\inc\*" target="build\native\include" />
19 - <file src="..\..\v140\x64\dutil.lib" target="build\native\v140\x64" />
20 - <file src="..\..\v140\x86\dutil.lib" target="build\native\v140\x86" />
21 - <file src="..\..\v141\x64\dutil.lib" target="build\native\v141\x64" />
22 - <file src="..\..\v141\x86\dutil.lib" target="build\native\v141\x86" />
23 - <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
24 - <file src="..\..\v142\x64\dutil.lib" target="build\native\v142\x64" />
25 - <file src="..\..\v142\x86\dutil.lib" target="build\native\v142\x86" />
26 - <file src="..\..\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
19 + <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
20 + <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
21 + <file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
22 </files>
23 </package>
src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
-1
@@ -34,7 +34,6 @@
34 <ConfigurationType>StaticLibrary</ConfigurationType>
35 <TargetName>dutil</TargetName>
36 <MultiTargetLibrary>true</MultiTargetLibrary>
37 - <PlatformToolset>v142</PlatformToolset>
37 <CharacterSet>MultiByte</CharacterSet>
38 <Description>WiX Toolset native library foundation</Description>
39 <PackageId>WixToolset.DUtil</PackageId>
src/libs/dutil/dutil.proj
+3 -10
@@ -1,15 +1,8 @@
1 <Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
4 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
5 -
6 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
7 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
8 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
9 -
10 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
11 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
12 - <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
3 + <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86" />
4 + <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64" />
5 + <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64" />
6
7 <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
8
src/libs/wcautil/WixToolset.WcaUtil/build/WixToolset.WcaUtil.props
+2 -12
@@ -10,19 +10,9 @@
10 <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11 </ResourceCompile>
12 </ItemDefinitionGroup>
13 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
13 + <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
14 <Link>
15 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 - </Link>
17 - </ItemDefinitionGroup>
18 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19 - <Link>
20 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 - </Link>
22 - </ItemDefinitionGroup>
23 - <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24 - <Link>
25 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15 + <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 </Link>
17 </ItemDefinitionGroup>
18 </Project>
src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+3 -8
@@ -19,13 +19,8 @@
19 <files>
20 <file src="$projectFolder$\build\$id$.props" target="build\" />
21 <file src="$projectFolder$\inc\*" target="build\native\include" />
22 - <file src="..\..\v140\x64\wcautil.lib" target="build\native\v140\x64" />
23 - <file src="..\..\v140\x86\wcautil.lib" target="build\native\v140\x86" />
24 - <file src="..\..\v141\x64\wcautil.lib" target="build\native\v141\x64" />
25 - <file src="..\..\v141\x86\wcautil.lib" target="build\native\v141\x86" />
26 - <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
27 - <file src="..\..\v142\x64\wcautil.lib" target="build\native\v142\x64" />
28 - <file src="..\..\v142\x86\wcautil.lib" target="build\native\v142\x86" />
29 - <file src="..\..\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" />
22 + <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
23 + <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
24 + <file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
25 </files>
26 </package>
src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj
-1
@@ -34,7 +34,6 @@
34 <ConfigurationType>StaticLibrary</ConfigurationType>
35 <TargetName>wcautil</TargetName>
36 <MultiTargetLibrary>true</MultiTargetLibrary>
37 - <PlatformToolset>v142</PlatformToolset>
37 <CharacterSet>MultiByte</CharacterSet>
38 <Description>WiX Toolset Custom Action native utility library</Description>
39 <PackageId>WixToolset.WcaUtil</PackageId>
src/libs/wcautil/wcautil.proj
+3 -10
@@ -1,15 +1,8 @@
1 <Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
4 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
5 -
6 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
7 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
8 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
9 -
10 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
11 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
12 - <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
3 + <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86" />
4 + <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64" />
5 + <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64" />
6
7 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" />
8 </ItemGroup>
src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj
-1
@@ -24,7 +24,6 @@
24 <ProjectGuid>{55D5BA28-D427-4F53-80C2-FE9EF23C1553}</ProjectGuid>
25 <ConfigurationType>DynamicLibrary</ConfigurationType>
26 <TargetName>SfxCA</TargetName>
27 - <PlatformToolset>v142</PlatformToolset>
27 <CharacterSet>Unicode</CharacterSet>
28 <ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile>
29 </PropertyGroup>
src/samples/thmviewer/thmviewer.vcxproj
-1
@@ -17,7 +17,6 @@
17 <ProjectGuid>{95228C13-97F5-484A-B4A2-ECF4618B0881}</ProjectGuid>
18 <Keyword>Win32Proj</Keyword>
19 <ConfigurationType>Application</ConfigurationType>
20 - <PlatformToolset>v142</PlatformToolset>
20 <CharacterSet>Unicode</CharacterSet>
21 <Description>WiX Toolset Theme Viewer</Description>
22 </PropertyGroup>
src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
-1
@@ -30,7 +30,6 @@
30 <PropertyGroup Label="Globals">
31 <ProjectGuid>{565E99AE-975F-4F26-8A6E-852603386A80}</ProjectGuid>
32 <ConfigurationType>DynamicLibrary</ConfigurationType>
33 - <PlatformToolset>v142</PlatformToolset>
33 <CharacterSet>Unicode</CharacterSet>
34 <TargetName>BafThmUtilTesting</TargetName>
35 <ProjectModuleDefinitionFile>BafThmUtilTesting.def</ProjectModuleDefinitionFile>
src/wix/wixnative/wixnative.vcxproj
-2
@@ -32,12 +32,10 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid>
34 <ConfigurationType>Application</ConfigurationType>
35 - <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet>
36 <ProjectSubSystem>Console</ProjectSubSystem>
37 <TargetName>wixnative</TargetName>
38 <Description>WiX Native Processing</Description>
40 - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
39 </PropertyGroup>
40
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />