Skip to content

Commit

Permalink
Merge e1b12fa into 26d6eda
Browse files Browse the repository at this point in the history
  • Loading branch information
dep5 authored Apr 12, 2021
2 parents 26d6eda + e1b12fa commit f188088
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .vsconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
"microsoft.visualstudio.component.vc.diagnostictools",
"microsoft.visualstudio.component.vc.cmake.project",
"microsoft.visualstudio.component.vc.atl",
"microsoft.visualstudio.component.windows10sdk.17763",
"microsoft.visualstudio.component.vc.cmake.project",
"microsoft.visualstudio.component.vc.testadapterforboosttest",
"microsoft.visualstudio.component.vc.testadapterforgoogletest",
"microsoft.visualstudio.componentgroup.nativedesktop.win81"
]
}
}
2 changes: 1 addition & 1 deletion vcx-props/vcxcompat.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Label="Globals" Condition="'$(VisualStudioVersion)' == '16.0'">
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '15.0'">
<PlatformToolset>v141</PlatformToolset>
Expand Down

0 comments on commit f188088

Please sign in to comment.