Skip to content

Commit a0aae11

Browse files
maxgolovmaxgolov
authored
Project stopped building with MSBuild 16.10.0 (#883)
* Move to PlatformToolset variable * Workaround for MSBuild issue in vs2019 16.10 * Apologies for Windows line endings, appears like original file had Unix line-endings
1 parent 15b2022 commit a0aae11

10 files changed

+36
-52
lines changed

‎build-Win32Debug.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ cd %~dp0
33
call tools\gen-version.cmd
44
@setlocal ENABLEEXTENSIONS
55

6-
call tools\RunMsBuild.bat Win32 Debug "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests"
6+
call tools\RunMsBuild.bat Win32 Debug "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild"
77
call tools\RunTests.bat Win32 Debug

‎build-Win32Release.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ cd %~dp0
33
call tools\gen-version.cmd
44
@setlocal ENABLEEXTENSIONS
55

6-
call tools\RunMsBuild.bat Win32 Release "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests"
6+
call tools\RunMsBuild.bat Win32 Release "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild"
77
call tools\RunTests.bat Win32 Release

‎build-all.bat

+12-12
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,43 @@ echo %CUSTOM_PROPS%
2222
if NOT DEFINED SKIP_MD_BUILD (
2323
REM DLL and static /MD build
2424
REM Release
25-
call tools\RunMsBuild.bat Win32 Release "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests" %CUSTOM_PROPS%
26-
call tools\RunMsBuild.bat x64 Release "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests" %CUSTOM_PROPS%
25+
call tools\RunMsBuild.bat Win32 Release "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild" %CUSTOM_PROPS%
26+
call tools\RunMsBuild.bat x64 Release "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild" %CUSTOM_PROPS%
2727
REM Debug
2828
if NOT DEFINED SKIP_DEBUG_BUILD (
29-
call tools\RunMsBuild.bat Win32 Debug "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests" %CUSTOM_PROPS%
30-
call tools\RunMsBuild.bat x64 Debug "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests" %CUSTOM_PROPS%
29+
call tools\RunMsBuild.bat Win32 Debug "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild" %CUSTOM_PROPS%
30+
call tools\RunMsBuild.bat x64 Debug "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild" %CUSTOM_PROPS%
3131
)
3232
)
3333

3434
if NOT DEFINED SKIP_MT_BUILD (
3535
REM Static /MT build
3636
REM Release
37-
call tools\RunMsBuild.bat Win32 Release.vc14x.MT-sqlite "sqlite,zlib,win32-lib" %CUSTOM_PROPS%
38-
call tools\RunMsBuild.bat x64 Release.vc14x.MT-sqlite "sqlite,zlib,win32-lib" %CUSTOM_PROPS%
37+
call tools\RunMsBuild.bat Win32 Release.vc14x.MT-sqlite "sqlite:Rebuild,zlib:Rebuild,win32-lib:Rebuild" %CUSTOM_PROPS%
38+
call tools\RunMsBuild.bat x64 Release.vc14x.MT-sqlite "sqlite:Rebuild,zlib:Rebuild,win32-lib:Rebuild" %CUSTOM_PROPS%
3939
REM Debug
4040
if NOT DEFINED SKIP_DEBUG_BUILD (
41-
call tools\RunMsBuild.bat Win32 Debug.vc14x.MT-sqlite "sqlite,zlib,win32-lib" %CUSTOM_PROPS%
42-
call tools\RunMsBuild.bat x64 Debug.vc14x.MT-sqlite "sqlite,zlib,win32-lib" %CUSTOM_PROPS%
41+
call tools\RunMsBuild.bat Win32 Debug.vc14x.MT-sqlite "sqlite:Rebuild,zlib:Rebuild,win32-lib:Rebuild" %CUSTOM_PROPS%
42+
call tools\RunMsBuild.bat x64 Debug.vc14x.MT-sqlite "sqlite:Rebuild,zlib:Rebuild,win32-lib:Rebuild" %CUSTOM_PROPS%
4343
)
4444
)
4545

4646
if NOT DEFINED SKIP_ARM_BUILD (
4747
REM ARM DLL build
4848
REM Release
49-
call tools\RunMsBuild.bat ARM Release "zlib,sqlite-uwp,win10-cs,win10-dll" %CUSTOM_PROPS%
49+
call tools\RunMsBuild.bat ARM Release "zlib:Rebuild,sqlite-uwp:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild" %CUSTOM_PROPS%
5050
if NOT DEFINED SKIP_DEBUG_BUILD (
5151
REM Debug
52-
call tools\RunMsBuild.bat ARM Debug "zlib,sqlite-uwp,win10-cs,win10-dll" %CUSTOM_PROPS%
52+
call tools\RunMsBuild.bat ARM Debug "zlib:Rebuild,sqlite-uwp:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild" %CUSTOM_PROPS%
5353
)
5454
)
5555

5656
if NOT DEFINED SKIP_ARM64_BUILD (
5757
REM ARM64 DLL build
5858
REM Release
59-
call tools\RunMsBuild.bat ARM64 Release "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,win10-cs,win10-dll" %CUSTOM_PROPS%
59+
call tools\RunMsBuild.bat ARM64 Release "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild" %CUSTOM_PROPS%
6060
if NOT DEFINED SKIP_DEBUG_BUILD (
6161
REM Debug
62-
call tools\RunMsBuild.bat ARM64 Debug "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,win10-cs,win10-dll" %CUSTOM_PROPS%
62+
call tools\RunMsBuild.bat ARM64 Debug "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild" %CUSTOM_PROPS%
6363
)
6464
)

‎build-tests.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Too
3232
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
3333
set SOLUTION=Solutions\MSTelemetrySDK.sln
3434

35-
msbuild %SOLUTION% /target:sqlite,zlib,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=%CONFIGURATION% /p:Platform=%PLAT% %CUSTOM_PROPS%
35+
msbuild %SOLUTION% /target:sqlite:Rebuild,zlib:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=%CONFIGURATION% /p:Platform=%PLAT% %CUSTOM_PROPS%
3636
if errorLevel 1 goto end
3737
Solutions\out\%CONFIGURATION%\%PLAT%\UnitTests\UnitTests.exe
3838
if errorLevel 1 goto end

‎build-win10-compact.bat

+8-8
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ echo Using custom properties file for the build:
2929
echo %CUSTOM_PROPS%
3030

3131
REM DLL and static /MD build
32-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=Win32 %CUSTOM_PROPS%
33-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=Win32 %CUSTOM_PROPS%
34-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=x64 %CUSTOM_PROPS%
35-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=x64 %CUSTOM_PROPS%
32+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=Win32 %CUSTOM_PROPS%
33+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=Win32 %CUSTOM_PROPS%
34+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=x64 %CUSTOM_PROPS%
35+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=x64 %CUSTOM_PROPS%
3636

3737
REM ARM DLL build
3838
call tools\vcvars-ext.cmd arm
39-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM %CUSTOM_PROPS%
40-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM %CUSTOM_PROPS%
39+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM %CUSTOM_PROPS%
40+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM %CUSTOM_PROPS%
4141

4242
REM ARM64 DLL build
4343
call tools\vcvars-ext.cmd arm64
44-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM64 %CUSTOM_PROPS%
45-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM64 %CUSTOM_PROPS%
44+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM64 %CUSTOM_PROPS%
45+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM64 %CUSTOM_PROPS%

‎build-win10-min.bat

+8-8
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ echo Using custom properties file for the build:
2929
echo %CUSTOM_PROPS%
3030

3131
REM DLL and static /MD build
32-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=Win32 %CUSTOM_PROPS%
33-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=Win32 %CUSTOM_PROPS%
34-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=x64 %CUSTOM_PROPS%
35-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=x64 %CUSTOM_PROPS%
32+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=Win32 %CUSTOM_PROPS%
33+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=Win32 %CUSTOM_PROPS%
34+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=x64 %CUSTOM_PROPS%
35+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=x64 %CUSTOM_PROPS%
3636

3737
REM ARM DLL build
3838
call tools\vcvars-ext.cmd arm
39-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM %CUSTOM_PROPS%
40-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM %CUSTOM_PROPS%
39+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM %CUSTOM_PROPS%
40+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM %CUSTOM_PROPS%
4141

4242
REM ARM64 DLL build
4343
call tools\vcvars-ext.cmd arm64
44-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM64 %CUSTOM_PROPS%
45-
msbuild %SOLUTION% /target:zlib,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM64 %CUSTOM_PROPS%
44+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM64 %CUSTOM_PROPS%
45+
msbuild %SOLUTION% /target:zlib:Rebuild,win10-dll:Rebuild /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM64 %CUSTOM_PROPS%

‎build-x64Debug.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ cd %~dp0
33
call tools\gen-version.cmd
44
@setlocal ENABLEEXTENSIONS
55

6-
call tools\RunMsBuild.bat x64 Debug "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests"
6+
call tools\RunMsBuild.bat x64 Debug "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild"
77
call tools\RunTests.bat x64 Debug

‎build-x64Release.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ cd %~dp0
33
call tools\gen-version.cmd
44
@setlocal ENABLEEXTENSIONS
55

6-
call tools\RunMsBuild.bat x64 Release "sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests"
7-
call tools\RunTests.bat x64 Release
6+
call tools\RunMsBuild.bat x64 Release "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-dll:Rebuild,win32-lib:Rebuild,net40:Rebuild,win10-cs:Rebuild,win10-dll:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild,Tests\FuncTests:Rebuild"
7+
call tools\RunTests.bat x64 Release

‎tools/ports/mstelemetry/portfile.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ else()
7171
OPTIONS /p:MATSDK_SHARED_LIB=1
7272
PLATFORM ${VCPKG_TARGET_ARCHITECTURE}
7373
PLATFORM_TOOLSET v142
74-
TARGET sqlite,win32-lib
74+
TARGET sqlite:Rebuild,win32-lib:Rebuild
7575
USE_VCPKG_INTEGRATION
7676
)
7777

‎zlib/contrib/vstudio/vc14/zlibvc.vcxproj

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(SolutionDir)\before.targets" Condition="Exists('$(SolutionDir)\before.targets')" />
44
<ItemGroup Label="ProjectConfigurations">
@@ -78,112 +78,96 @@
7878
<UseOfMfc>false</UseOfMfc>
7979
<WholeProgramOptimization>false</WholeProgramOptimization>
8080
<CharacterSet>Unicode</CharacterSet>
81-
<PlatformToolset>v141</PlatformToolset>
8281
</PropertyGroup>
8382
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.vc14x.MT-sqlite|Win32'" Label="Configuration">
8483
<ConfigurationType>StaticLibrary</ConfigurationType>
8584
<UseOfMfc>false</UseOfMfc>
8685
<WholeProgramOptimization>false</WholeProgramOptimization>
8786
<CharacterSet>Unicode</CharacterSet>
88-
<PlatformToolset>v141</PlatformToolset>
8987
</PropertyGroup>
9088
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
9189
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
9290
<ConfigurationType>StaticLibrary</ConfigurationType>
9391
<UseOfMfc>false</UseOfMfc>
9492
<WholeProgramOptimization>false</WholeProgramOptimization>
9593
<CharacterSet>Unicode</CharacterSet>
96-
<PlatformToolset>v141</PlatformToolset>
9794
</PropertyGroup>
9895
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
9996
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
10097
<ConfigurationType>StaticLibrary</ConfigurationType>
10198
<UseOfMfc>false</UseOfMfc>
10299
<WholeProgramOptimization>false</WholeProgramOptimization>
103100
<CharacterSet>Unicode</CharacterSet>
104-
<PlatformToolset>v141</PlatformToolset>
105101
</PropertyGroup>
106102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.vc14x.MT-sqlite|ARM'" Label="Configuration">
107103
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
108104
<ConfigurationType>StaticLibrary</ConfigurationType>
109105
<UseOfMfc>false</UseOfMfc>
110106
<WholeProgramOptimization>false</WholeProgramOptimization>
111107
<CharacterSet>Unicode</CharacterSet>
112-
<PlatformToolset>v141</PlatformToolset>
113108
</PropertyGroup>
114109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.vc14x.MT-sqlite|ARM64'" Label="Configuration">
115110
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
116111
<ConfigurationType>StaticLibrary</ConfigurationType>
117112
<UseOfMfc>false</UseOfMfc>
118113
<WholeProgramOptimization>false</WholeProgramOptimization>
119114
<CharacterSet>Unicode</CharacterSet>
120-
<PlatformToolset>v141</PlatformToolset>
121115
</PropertyGroup>
122116
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
123117
<ConfigurationType>StaticLibrary</ConfigurationType>
124118
<UseOfMfc>false</UseOfMfc>
125119
<CharacterSet>Unicode</CharacterSet>
126-
<PlatformToolset>v141</PlatformToolset>
127120
</PropertyGroup>
128121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.vc14x.MT-sqlite|Win32'" Label="Configuration">
129122
<ConfigurationType>StaticLibrary</ConfigurationType>
130123
<UseOfMfc>false</UseOfMfc>
131124
<CharacterSet>Unicode</CharacterSet>
132-
<PlatformToolset>v141</PlatformToolset>
133125
</PropertyGroup>
134126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
135127
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
136128
<ConfigurationType>StaticLibrary</ConfigurationType>
137129
<UseOfMfc>false</UseOfMfc>
138130
<CharacterSet>Unicode</CharacterSet>
139-
<PlatformToolset>v141</PlatformToolset>
140131
</PropertyGroup>
141132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
142133
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
143134
<ConfigurationType>StaticLibrary</ConfigurationType>
144135
<UseOfMfc>false</UseOfMfc>
145136
<CharacterSet>Unicode</CharacterSet>
146-
<PlatformToolset>v141</PlatformToolset>
147137
</PropertyGroup>
148138
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.vc14x.MT-sqlite|ARM'" Label="Configuration">
149139
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
150140
<ConfigurationType>StaticLibrary</ConfigurationType>
151141
<UseOfMfc>false</UseOfMfc>
152142
<CharacterSet>Unicode</CharacterSet>
153-
<PlatformToolset>v141</PlatformToolset>
154143
</PropertyGroup>
155144
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.vc14x.MT-sqlite|ARM64'" Label="Configuration">
156145
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
157146
<ConfigurationType>StaticLibrary</ConfigurationType>
158147
<UseOfMfc>false</UseOfMfc>
159148
<CharacterSet>Unicode</CharacterSet>
160-
<PlatformToolset>v141</PlatformToolset>
161149
</PropertyGroup>
162150
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
163151
<ConfigurationType>StaticLibrary</ConfigurationType>
164152
<UseOfMfc>false</UseOfMfc>
165153
<WholeProgramOptimization>false</WholeProgramOptimization>
166154
<CharacterSet>Unicode</CharacterSet>
167-
<PlatformToolset>v141</PlatformToolset>
168155
</PropertyGroup>
169156
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.vc14x.MT-sqlite|x64'" Label="Configuration">
170157
<ConfigurationType>StaticLibrary</ConfigurationType>
171158
<UseOfMfc>false</UseOfMfc>
172159
<WholeProgramOptimization>false</WholeProgramOptimization>
173160
<CharacterSet>Unicode</CharacterSet>
174-
<PlatformToolset>v141</PlatformToolset>
175161
</PropertyGroup>
176162
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
177163
<ConfigurationType>StaticLibrary</ConfigurationType>
178164
<UseOfMfc>false</UseOfMfc>
179165
<CharacterSet>Unicode</CharacterSet>
180-
<PlatformToolset>v141</PlatformToolset>
181166
</PropertyGroup>
182167
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.vc14x.MT-sqlite|x64'" Label="Configuration">
183168
<ConfigurationType>StaticLibrary</ConfigurationType>
184169
<UseOfMfc>false</UseOfMfc>
185170
<CharacterSet>Unicode</CharacterSet>
186-
<PlatformToolset>v141</PlatformToolset>
187171
</PropertyGroup>
188172
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
189173
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)