Revert unintentional commit from r194477.

llvm-svn: 194478

1 files changed, 39 insertions, 16 deletions

diff --git a/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj b/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
index f26fc1a72cb..51e138216d6 100644
--- a/clang/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
+++ b/clang/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