Use `v143` toolset except `v141` for libs.
Bob Arnson committed
Dec 12, 2021 at 23:26 UTC
5bb1c768a8124505c87fc1db3f702675b50d54ab
10 files changed
+29
-20
src/Directory.Build.props
+5
@@ -17,6 +17,11 @@
17
<BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
18
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
19
20
+ <!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
21
+ <WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset>
22
+ <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
23
+ <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
24
+
25
<Authors>WiX Toolset Team</Authors>
26
<Company>WiX Toolset</Company>
27
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
src/Directory.vcxproj.props
+5
-1
@@ -8,7 +8,11 @@
8
<PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder>
9
<IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\</IntDir>
10
<OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
11
- <PlatformToolset>v143</PlatformToolset>
11
+ </PropertyGroup>
12
+
13
+ <!-- This is needed for v141 toolset, which doesn't understand `10.0` -->
14
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
15
+ <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
16
</PropertyGroup>
17
18
<PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
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)\v143\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
22
- <None Include="$(BaseOutputPath)$(Configuration)\v143\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
21
+ <None Include="$(BaseOutputPath)$(Configuration)\$(PlatformToolset)\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
22
+ <None Include="$(BaseOutputPath)$(Configuration)\$(PlatformToolset)\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
23
</ItemGroup>
24
<ItemGroup Condition=" '$(NCrunch)'=='1' ">
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" />
25
+ <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\$(PlatformToolset)\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
26
+ <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\$(PlatformToolset)\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
27
</ItemGroup>
28
</Project>
src/api/burn/balutil/balutil.nuspec
+3
-3
@@ -20,8 +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="..\..\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" />
23
+ <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />
24
+ <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" />
25
+ <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
26
</files>
27
</package>
src/api/burn/bextutil/bextutil.nuspec
+3
-3
@@ -20,8 +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="..\..\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" />
23
+ <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
24
+ <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
25
+ <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
26
</files>
27
</package>
src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+1
-1
@@ -32,7 +32,7 @@
32
33
<PropertyGroup>
34
<ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
35
- <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
35
+ <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
36
</PropertyGroup>
37
38
<ItemGroup>
src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+1
-1
@@ -31,7 +31,7 @@
31
32
<PropertyGroup>
33
<ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
34
- <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
34
+ <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
35
</PropertyGroup>
36
37
<ItemGroup>
src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+1
-1
@@ -39,7 +39,7 @@
39
40
<PropertyGroup>
41
<ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
42
- <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
42
+ <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
43
</PropertyGroup>
44
45
<ItemGroup>
src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+3
-3
@@ -16,8 +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="..\..\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" />
19
+ <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
20
+ <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
21
+ <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" />
22
</files>
23
</package>
src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+3
-3
@@ -19,8 +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="..\..\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" />
22
+ <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
23
+ <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
24
+ <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
25
</files>
26
</package>