Skip to content

Commit e292262

Browse files
committed
Migrate clang-format-vs plugin project to VS 2013
The plugin still works fine in versions starting from 2010, but this was needed to make the project _build_ in VS 2013, which is the blessed version for building LLVM projects these days. http://reviews.llvm.org/D8021 llvm-svn: 231084
1 parent f04be1f commit e292262

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
1616
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
17-
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
17+
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
2020
<UpgradeBackupLocation>
@@ -219,9 +219,7 @@
219219
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
220220
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
221221
<PropertyGroup>
222-
<PreBuildEvent>if not exist $(ProjectDir)Key.snk (
223-
"$(FrameworkSDKDir)Bin\NETFX 4.0 Tools\sn.exe" -k $(ProjectDir)Key.snk
224-
)</PreBuildEvent>
222+
<PreBuildEvent>if not exist $(ProjectDir)Key.snk ("$(FrameworkSDKDir)Bin\NETFX 4.5.1 Tools\sn.exe" -k $(ProjectDir)Key.snk)</PreBuildEvent>
225223
</PropertyGroup>
226224
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
227225
Other similar extension points exist, see Microsoft.Common.targets.

clang/tools/clang-format-vs/ClangFormat/Resources.Designer.cs

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)