Skip to content

Commit 2cf36e1

Browse files
speblspebl
authored
Update projects and build scripts to work with VS 2019 CI pipeline (#199)
* update windows platform from 8.1 to 10.0 * update build tools version * update build script to use vs 2019
1 parent b45a81a commit 2cf36e1

File tree

17 files changed

+64
-18
lines changed

17 files changed

+64
-18
lines changed

‎GoogleTestAdapter/CrashingExe/CrashingExe.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{72AEA89D-FA32-4E4F-BA04-9C670B53F746}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>CrashingExe</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -35,6 +35,7 @@
3535
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
3636
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3737
<CharacterSet>Unicode</CharacterSet>
38+
<PlatformToolset>v142</PlatformToolset>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>Application</ConfigurationType>
@@ -46,6 +47,7 @@
4647
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
4748
<WholeProgramOptimization>true</WholeProgramOptimization>
4849
<CharacterSet>Unicode</CharacterSet>
50+
<PlatformToolset>v142</PlatformToolset>
4951
</PropertyGroup>
5052
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5153
<ConfigurationType>Application</ConfigurationType>

‎GoogleTestAdapter/FailingExe/FailingExe.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{6EFFF365-F626-4BBA-A255-38468E4DF6E0}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>FailingExe</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -35,6 +35,7 @@
3535
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
3636
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3737
<CharacterSet>Unicode</CharacterSet>
38+
<PlatformToolset>v142</PlatformToolset>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>Application</ConfigurationType>
@@ -46,6 +47,7 @@
4647
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
4748
<WholeProgramOptimization>true</WholeProgramOptimization>
4849
<CharacterSet>Unicode</CharacterSet>
50+
<PlatformToolset>v142</PlatformToolset>
4951
</PropertyGroup>
5052
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5153
<ConfigurationType>Application</ConfigurationType>

‎GoogleTestAdapter/FakeGtestDll/FakeGtestDllApplication-x64.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectGuid>{05C435E1-603C-4402-B28C-E54932F3131C}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>FakeGtestDllApplication</RootNamespace>
17-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27,6 +27,7 @@
2727
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
2828
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3233
<ConfigurationType>Application</ConfigurationType>
@@ -38,6 +39,7 @@
3839
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
4143
</PropertyGroup>
4244
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4345
<ImportGroup Label="ExtensionSettings">

‎GoogleTestAdapter/FakeGtestDll/FakeGtestDllApplication.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectGuid>{C2601F9E-8B97-4901-85F4-2531102543C8}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>FakeGtestDllApplication</RootNamespace>
17-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27,6 +27,7 @@
2727
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
2828
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3233
<ConfigurationType>Application</ConfigurationType>
@@ -38,6 +39,7 @@
3839
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
4143
</PropertyGroup>
4244
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4345
<ImportGroup Label="ExtensionSettings">

‎GoogleTestAdapter/FakeGtestDll/FakeGtestDllLibrary-x64.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectGuid>{8C66B902-B3B3-40C1-B178-7F5405F654B0}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>FakeGtestDllLibrary</RootNamespace>
17-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27,6 +27,7 @@
2727
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
2828
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3233
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,6 +39,7 @@
3839
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
4143
</PropertyGroup>
4244
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4345
<ImportGroup Label="ExtensionSettings">

‎GoogleTestAdapter/FakeGtestDll/FakeGtestDllLibrary.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectGuid>{DB701549-3F79-4D1D-9DB9-CA55683D679E}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>FakeGtestDllLibrary</RootNamespace>
17-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27,6 +27,7 @@
2727
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
2828
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3233
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,6 +39,7 @@
3839
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
4143
</PropertyGroup>
4244
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4345
<ImportGroup Label="ExtensionSettings">

‎GoogleTestAdapter/SemaphoreExe/SemaphoreExe.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<ProjectGuid>{F48AD2EC-96B3-41C6-9F89-3542EC7A3D43}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>SemaphoreExe</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎GoogleTestAdapter/UnicodeNameExe/UnicodeNameExe.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectGuid>{8B27FD59-F03C-468E-B878-CFFC7484B7F7}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>㐀㕵ExtAxCP936丂狛狜</RootNamespace>
17-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27,6 +27,7 @@
2727
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
2828
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3233
<ConfigurationType>Application</ConfigurationType>
@@ -38,6 +39,7 @@
3839
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
4143
</PropertyGroup>
4244
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4345
<ImportGroup Label="ExtensionSettings">

‎GoogleTestNuGet/Build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function Build-Binaries {
194194
Push-Location $Dir
195195
try {
196196
$CMakeArgs = @()
197-
$CMakeArgs += "-G", "Visual Studio 15 2017"
197+
$CMakeArgs += "-G", "Visual Studio 16 2019"
198198
$CMakeArgs += "-T", $BuildToolset
199199
$CMakeArgs += "-A", $Platform
200200
$CMakeArgs += "-D", "BUILD_SHARED_LIBS=$(Convert-BooleanToOnOff $DynamicLibraryLinkage)"

‎SampleTests/CrashingTests/CrashingTests.vcxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{4A4606CD-6D7B-4F76-8981-46D3C74E18BD}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>ConsoleApplication2</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
<ProjectName>CrashingTests</ProjectName>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
@@ -38,23 +38,27 @@
3838
<ConfigurationType>Application</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
4040
<CharacterSet>Unicode</CharacterSet>
41+
<PlatformToolset>v142</PlatformToolset>
4142
</PropertyGroup>
4243
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4344
<ConfigurationType>Application</ConfigurationType>
4445
<UseDebugLibraries>false</UseDebugLibraries>
4546
<WholeProgramOptimization>true</WholeProgramOptimization>
4647
<CharacterSet>Unicode</CharacterSet>
48+
<PlatformToolset>v142</PlatformToolset>
4749
</PropertyGroup>
4850
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4951
<ConfigurationType>Application</ConfigurationType>
5052
<UseDebugLibraries>true</UseDebugLibraries>
5153
<CharacterSet>Unicode</CharacterSet>
54+
<PlatformToolset>v142</PlatformToolset>
5255
</PropertyGroup>
5356
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5457
<ConfigurationType>Application</ConfigurationType>
5558
<UseDebugLibraries>false</UseDebugLibraries>
5659
<WholeProgramOptimization>true</WholeProgramOptimization>
5760
<CharacterSet>Unicode</CharacterSet>
61+
<PlatformToolset>v142</PlatformToolset>
5862
</PropertyGroup>
5963
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6064
<ImportGroup Label="ExtensionSettings">

‎SampleTests/DllDependentProject/DllDependentProject.vcxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ProjectGuid>{2E3221EB-86DA-427D-84EC-DEFD3F966D9A}</ProjectGuid>
2424
<Keyword>Win32Proj</Keyword>
2525
<RootNamespace>DllDependentProject</RootNamespace>
26-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
<ProjectName>DllTests</ProjectName>
2828
</PropertyGroup>
2929
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
@@ -37,6 +37,7 @@
3737
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
3838
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3939
<CharacterSet>Unicode</CharacterSet>
40+
<PlatformToolset>v142</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4243
<ConfigurationType>Application</ConfigurationType>
@@ -48,6 +49,7 @@
4849
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
4950
<WholeProgramOptimization>true</WholeProgramOptimization>
5051
<CharacterSet>Unicode</CharacterSet>
52+
<PlatformToolset>v142</PlatformToolset>
5153
</PropertyGroup>
5254
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5355
<ConfigurationType>Application</ConfigurationType>
@@ -58,6 +60,7 @@
5860
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
5961
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
6062
<CharacterSet>Unicode</CharacterSet>
63+
<PlatformToolset>v142</PlatformToolset>
6164
</PropertyGroup>
6265
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6366
<ConfigurationType>Application</ConfigurationType>
@@ -69,6 +72,7 @@
6972
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
7073
<WholeProgramOptimization>true</WholeProgramOptimization>
7174
<CharacterSet>Unicode</CharacterSet>
75+
<PlatformToolset>v142</PlatformToolset>
7276
</PropertyGroup>
7377
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7478
<ImportGroup Label="ExtensionSettings">

‎SampleTests/DllProject/DllProject.vcxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ProjectGuid>{BAB53542-85AA-4780-9F48-2984C036189A}</ProjectGuid>
2424
<Keyword>Win32Proj</Keyword>
2525
<RootNamespace>DllProject</RootNamespace>
26-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -36,6 +36,7 @@
3636
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
3737
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3838
<CharacterSet>Unicode</CharacterSet>
39+
<PlatformToolset>v142</PlatformToolset>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4142
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -47,6 +48,7 @@
4748
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
4849
<WholeProgramOptimization>true</WholeProgramOptimization>
4950
<CharacterSet>Unicode</CharacterSet>
51+
<PlatformToolset>v142</PlatformToolset>
5052
</PropertyGroup>
5153
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5254
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -57,6 +59,7 @@
5759
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
5860
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
5961
<CharacterSet>Unicode</CharacterSet>
62+
<PlatformToolset>v142</PlatformToolset>
6063
</PropertyGroup>
6164
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6265
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -68,6 +71,7 @@
6871
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
6972
<WholeProgramOptimization>true</WholeProgramOptimization>
7073
<CharacterSet>Unicode</CharacterSet>
74+
<PlatformToolset>v142</PlatformToolset>
7175
</PropertyGroup>
7276
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7377
<ImportGroup Label="ExtensionSettings">

‎SampleTests/LibProject/LibProject.vcxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{1F2C133F-B7BD-4446-A65C-3F7EF9A22CE0}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>Lib</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
<ProjectName>LibProject</ProjectName>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Common.props))\Common.props" />
@@ -38,23 +38,27 @@
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
4040
<CharacterSet>Unicode</CharacterSet>
41+
<PlatformToolset>v142</PlatformToolset>
4142
</PropertyGroup>
4243
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4344
<ConfigurationType>StaticLibrary</ConfigurationType>
4445
<UseDebugLibraries>false</UseDebugLibraries>
4546
<WholeProgramOptimization>true</WholeProgramOptimization>
4647
<CharacterSet>Unicode</CharacterSet>
48+
<PlatformToolset>v142</PlatformToolset>
4749
</PropertyGroup>
4850
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4951
<ConfigurationType>StaticLibrary</ConfigurationType>
5052
<UseDebugLibraries>true</UseDebugLibraries>
5153
<CharacterSet>Unicode</CharacterSet>
54+
<PlatformToolset>v142</PlatformToolset>
5255
</PropertyGroup>
5356
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5457
<ConfigurationType>StaticLibrary</ConfigurationType>
5558
<UseDebugLibraries>false</UseDebugLibraries>
5659
<WholeProgramOptimization>true</WholeProgramOptimization>
5760
<CharacterSet>Unicode</CharacterSet>
61+
<PlatformToolset>v142</PlatformToolset>
5862
</PropertyGroup>
5963
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6064
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)