diff options
author | Hans Wennborg <hans@hanshq.net> | 2015-03-03 17:30:50 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2015-03-03 17:30:50 +0000 |
commit | c38c2dffc76ca21d6f649d2b234e4f70688fdfa4 (patch) | |
tree | 00da13c18495a25e0151681de153895fe82b647b /tools/clang-format-vs/ClangFormat | |
parent | 854a1dce88410944503961dc2d30f961f298a24b (diff) | |
download | clang-c38c2dffc76ca21d6f649d2b234e4f70688fdfa4.tar.gz |
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
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@231084 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/clang-format-vs/ClangFormat')
-rw-r--r-- | tools/clang-format-vs/ClangFormat/ClangFormat.csproj | 6 | ||||
-rw-r--r-- | tools/clang-format-vs/ClangFormat/Resources.Designer.cs | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/clang-format-vs/ClangFormat/ClangFormat.csproj b/tools/clang-format-vs/ClangFormat/ClangFormat.csproj index 709b33d6fa..a61e431cc0 100644 --- a/tools/clang-format-vs/ClangFormat/ClangFormat.csproj +++ b/tools/clang-format-vs/ClangFormat/ClangFormat.csproj @@ -14,7 +14,7 @@ <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+ <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -219,9 +219,7 @@ <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
<PropertyGroup>
- <PreBuildEvent>if not exist $(ProjectDir)Key.snk (
- "$(FrameworkSDKDir)Bin\NETFX 4.0 Tools\sn.exe" -k $(ProjectDir)Key.snk
-)</PreBuildEvent>
+ <PreBuildEvent>if not exist $(ProjectDir)Key.snk ("$(FrameworkSDKDir)Bin\NETFX 4.5.1 Tools\sn.exe" -k $(ProjectDir)Key.snk)</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/tools/clang-format-vs/ClangFormat/Resources.Designer.cs b/tools/clang-format-vs/ClangFormat/Resources.Designer.cs index efec031e16..a90251771d 100644 --- a/tools/clang-format-vs/ClangFormat/Resources.Designer.cs +++ b/tools/clang-format-vs/ClangFormat/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18408
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -59,6 +59,5 @@ namespace LLVM.ClangFormat { resourceCulture = value;
}
}
-
}
}
|