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

diff --git a/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj b/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
index 709b33d..a61e431 100644 (file)
--- a/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
+++ b/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>true</SignAssembly>\r
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>\r
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>\r
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>\r
     <FileUpgradeFlags>\r
     </FileUpgradeFlags>\r
     <UpgradeBackupLocation>\r
@@ -219,9 +219,7 @@
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />\r
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />\r
   <PropertyGroup>\r
-    <PreBuildEvent>if not exist $(ProjectDir)Key.snk (\r
-  "$(FrameworkSDKDir)Bin\NETFX 4.0 Tools\sn.exe" -k $(ProjectDir)Key.snk\r
-)</PreBuildEvent>\r
+    <PreBuildEvent>if not exist $(ProjectDir)Key.snk ("$(FrameworkSDKDir)Bin\NETFX 4.5.1 Tools\sn.exe" -k $(ProjectDir)Key.snk)</PreBuildEvent>\r
   </PropertyGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/clang/tools/clang-format-vs/ClangFormat/Resources.Designer.cs b/clang/tools/clang-format-vs/ClangFormat/Resources.Designer.cs
index efec031..a902517 100644 (file)
--- a/clang/tools/clang-format-vs/ClangFormat/Resources.Designer.cs
+++ b/clang/tools/clang-format-vs/ClangFormat/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.18408\r
+//     Runtime Version:4.0.30319.34209\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -59,6 +59,5 @@ namespace LLVM.ClangFormat {
                 resourceCulture = value;\r
             }\r
         }\r
-        \r
     }\r
 }\r