Revert unintentional commit from r194477.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@194478 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 67 insertions, 53 deletions

diff --git a/tools/clang-format-vs/ClangFormat.sln b/tools/clang-format-vs/ClangFormat.sln
index 56d89555d6..d6b211fe50 100644
--- a/tools/clang-format-vs/ClangFormat.sln
+++ b/tools/clang-format-vs/ClangFormat.sln
@@ -1,7 +1,7 @@
 

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangFormat", "ClangFormat\ClangFormat.csproj", "{70E9F7C8-C51D-436C-A16E-135A9DBE1266}"

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2012

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangFormat", "ClangFormat\ClangFormat.csproj", "{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -9,10 +9,10 @@ Global
 		Release|Any CPU = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Release|Any CPU.Build.0 = Release|Any CPU

+		{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Release|Any CPU.Build.0 = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/tools/clang-format-vs/ClangFormat/ClangFormat.csproj b/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
index f26fc1a72c..51e138216d 100644
--- a/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
+++ b/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
@@ -1,18 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

   <PropertyGroup>

+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>

+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>

+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

+  </PropertyGroup>

+  <PropertyGroup>

+    <DelaySign>false</DelaySign>

+  </PropertyGroup>

+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

+  <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{70e9f7c8-c51d-436c-a16e-135a9dbe1266}</ProjectGuid>

+    <ProjectGuid>{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}</ProjectGuid>

     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

     <OutputType>Library</OutputType>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Company.ClangFormat</RootNamespace>

+    <RootNamespace>LLVM.ClangFormat</RootNamespace>

     <AssemblyName>ClangFormat</AssemblyName>

-    <SignAssembly>True</SignAssembly>

+    <SignAssembly>true</SignAssembly>

     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -22,6 +31,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

+    <CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>

+    <RunCodeAnalysis>false</RunCodeAnalysis>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <DebugType>pdbonly</DebugType>

@@ -34,16 +45,24 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="Microsoft.CSharp" />

+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Editor, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />

-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />

-    <Reference Include="Microsoft.VisualStudio.Shell.10.0">

-      <Private>false</Private>

+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">

+      <EmbedInteropTypes>true</EmbedInteropTypes>

     </Reference>

+    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />

+    <Reference Include="Microsoft.VisualStudio.Shell.11.0" />

     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />

+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />

     <Reference Include="System" />

     <Reference Include="System.Core" />

     <Reference Include="System.Data" />

@@ -51,6 +70,7 @@
     <Reference Include="System.Drawing" />

     <Reference Include="System.Windows.Forms" />

     <Reference Include="System.Xml" />

+    <Reference Include="System.Xml.Linq" />

   </ItemGroup>

   <ItemGroup>

     <COMReference Include="EnvDTE">

@@ -116,9 +136,10 @@
       <DependentUpon>Resources.resx</DependentUpon>

     </Compile>

     <Compile Include="GlobalSuppressions.cs" />

-    <Compile Include="ClangFormatPackage.cs" />

+    <Compile Include="ClangFormatPackage.cs">

+      <SubType>Component</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs" />

-

     <Compile Include="PkgCmdID.cs" />

   </ItemGroup>

   <ItemGroup>

@@ -133,22 +154,19 @@
     </EmbeddedResource>

   </ItemGroup>

   <ItemGroup>

+    <None Include="Key.snk" />

     <None Include="source.extension.vsixmanifest">

       <SubType>Designer</SubType>

     </None>

   </ItemGroup>

   <ItemGroup>

-    <None Include="Key.snk" />

-  </ItemGroup>

-  <ItemGroup>

     <VSCTCompile Include="ClangFormat.vsct">

       <ResourceName>Menus.ctmenu</ResourceName>

     </VSCTCompile>

   </ItemGroup>

   <ItemGroup>

-    <None Include="Resources\Images_32bit.bmp" />

+    <None Include="Resources\Images.png" />

   </ItemGroup>

-

   <ItemGroup>

     <Content Include="Resources\Package.ico" />

   </ItemGroup>

@@ -156,7 +174,12 @@
     <UseCodebase>true</UseCodebase>

   </PropertyGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />

+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

+  <PropertyGroup>

+    <PreBuildEvent>if not exist $(ProjectDir)Key.snk (

+  "$(FrameworkSDKDir)Bin\NETFX 4.0 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.

   <Target Name="BeforeBuild">

@@ -164,4 +187,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>

+</Project>
\ No newline at end of file
diff --git a/tools/clang-format-vs/ClangFormat/ClangFormat.vsct b/tools/clang-format-vs/ClangFormat/ClangFormat.vsct
index 4c92379a2d..9037ecde24 100644
--- a/tools/clang-format-vs/ClangFormat/ClangFormat.vsct
+++ b/tools/clang-format-vs/ClangFormat/ClangFormat.vsct
@@ -20,9 +20,6 @@
   <!--This header contains the command ids for the menus provided by the shell. -->

   <Extern href="vsshlids.h"/>

 

-  <!--Definition of some VSCT specific constants. In this sample we use it for the IDs inside the guidOfficeIcon group. -->

-  <Extern href="msobtnid.h"/>

-

 

 

 

@@ -62,7 +59,7 @@
           You can add more than one CommandFlag node e.g.:

               <CommandFlag>DefaultInvisible</CommandFlag>

               <CommandFlag>DynamicVisibility</CommandFlag>

-          If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->

+          If you do not want an image next to your command, remove the Icon node /> -->

 

       <Button guid="guidClangFormatCmdSet" id="cmdidClangFormat" priority="0x0100" type="Button">

         <Parent guid="guidClangFormatCmdSet" id="MyMenuGroup" />

@@ -83,8 +80,8 @@
             bitmap strip containing the bitmaps and then there are the numeric ids of the elements used 

             inside a button definition. An important aspect of this declaration is that the element id 

             must be the actual index (1-based) of the bitmap inside the bitmap strip. -->

-      <Bitmap guid="guidImages" href="Resources\Images_32bit.bmp" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>

-

+      <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>

+      

     </Bitmaps>

  

   </Commands>

@@ -115,6 +112,7 @@
       <IDSymbol name="bmpPicSearch" value="3" />

       <IDSymbol name="bmpPicX" value="4" />

       <IDSymbol name="bmpPicArrows" value="5" />

+      <IDSymbol name="bmpPicStrikethrough" value="6" />

     </GuidSymbol>

   </Symbols>

 

diff --git a/tools/clang-format-vs/ClangFormat/Resources/Package.ico b/tools/clang-format-vs/ClangFormat/Resources/Package.ico
index ea3b23fe8d..449296f495 100644
--- a/tools/clang-format-vs/ClangFormat/Resources/Package.ico
+++ b/tools/clang-format-vs/ClangFormat/Resources/Package.ico
diff --git a/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest b/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest
index b559e9c8ec..274c028ed2 100644
--- a/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest
+++ b/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">

-  <Identifier Id="20dbc914-1c7a-4992-b236-ef58b37850eb">

-    <Name>ClangFormat</Name>

-    <Author>LLVM</Author>

-    <Version>1.0</Version>

-    <Description xml:space="preserve">Information about my package</Description>

-    <Locale>1033</Locale>

-    <InstalledByMsi>false</InstalledByMsi>

-    <SupportedProducts>

-      <VisualStudio Version="10.0">

-        <Edition>Pro</Edition>

-      </VisualStudio>

-    </SupportedProducts>

-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />

-  </Identifier>

-  <References>

-        <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">

-            <Name>Visual Studio MPF</Name>

-        </Reference>

-  </References>

-  <Content>

-    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>

-  </Content>

-</Vsix>

+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">

+  <Metadata>

+    <Identity Id="c5286038-25d3-4f65-83a8-51fa2df4a146" Version="1.0" Language="en-US" Publisher="LLVM" />

+    <DisplayName>ClangFormat</DisplayName>

+    <Description>Formats code by calling the clang-format executable.</Description>

+  </Metadata>

+  <Installation InstalledByMsi="false">

+    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />

+  </Installation>

+  <Dependencies>

+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />

+    <Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="11.0" />

+  </Dependencies>

+  <Assets>

+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />

+  </Assets>

+</PackageManifest>