Skip to content

Commit e707f28

Browse files
Merge pull request #300 from microsoft/dev/davidraygoza/targetsUpdate
Add support for new v145 toolset
2 parents 6b96200 + c567405 commit e707f28

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Keyword>Win32Proj</Keyword>
2525
<WindowsTargetPlatformVersion>$targetplatformversion$</WindowsTargetPlatformVersion>
2626
<ConfigurationType>Application</ConfigurationType>
27-
<PlatformToolset>v143</PlatformToolset>
27+
<PlatformToolset>$platformtoolset$</PlatformToolset>
2828
<CharacterSet>Unicode</CharacterSet>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

GoogleTestNuGet/googletest.targets.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<#@ parameter type="System.String" name="PathToBinaries" #>
66
<#@ parameter type="System.String" name="ConfigurationType" #>
77
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
8-
<PropertyGroup Condition="'$(Force-Enable-<#= PackageNameDashes #>)' == '' And (('$(PlatformToolset)' != 'v143' And '$(PlatformToolset)' != 'v142' And '$(PlatformToolset)' != 'v141' And '$(PlatformToolset)' != 'v140') Or '$(ApplicationType)' != '')">
8+
<PropertyGroup Condition="'$(Force-Enable-<#= PackageNameDashes #>)' == '' And (('$(PlatformToolset)' != 'v145' AND '$(PlatformToolset)' != 'v143' And '$(PlatformToolset)' != 'v142' And '$(PlatformToolset)' != 'v141' And '$(PlatformToolset)' != 'v140') Or '$(ApplicationType)' != '')">
99
<Disable-<#= PackageNameDashes #>>true</Disable-<#= PackageNameDashes #>>
1010
</PropertyGroup>
1111
<PropertyGroup Condition="'$(Force-Disable-<#= PackageNameDashes #>)' != ''">

0 commit comments

Comments
 (0)