From 57a36b80f8c127e7c4cacae25729d837715aa082 Mon Sep 17 00:00:00 2001
From: Mohamed Suhaib Fahad <mohamedsuhaiba@live.in>
Date: Mon, 5 Mar 2012 19:47:23 +0530
Subject: [PATCH] fix: VS11 beta compatible code changes

---
 ProjectExtender/Project/ItemList.cs           | 3 ++-
 ProjectExtender/ProjectExtender.vsct          | 2 +-
 ProjectExtender/ProjectExtender11.csproj      | 3 ++-
 ProjectExtender/ProjectExtender11.sln         | 1 +
 ProjectExtender/source.extension.vsixmanifest | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ProjectExtender/Project/ItemList.cs b/ProjectExtender/Project/ItemList.cs
index 4854795..91c8a00 100644
--- a/ProjectExtender/Project/ItemList.cs
+++ b/ProjectExtender/Project/ItemList.cs
@@ -124,7 +124,8 @@ private Constants.ItemNodeType get_node_type(uint itemId)
             catch (COMException e)
             {
                 // FSharp project returns Guid.Empty as the type guid for reference nodes, which causes the WAP to throw an exception
-                var pinfo = e.GetType().GetProperty("HResult", BindingFlags.Instance | BindingFlags.NonPublic);
+                //var pinfo = e.GetType().GetProperty("HResult", BindingFlags.Instance | BindingFlags.NonPublic);
+                var pinfo = e.GetType().GetProperty("HResult");
                 if ((int)pinfo.GetValue(e, new object[] { }) == VSConstants.DISP_E_MEMBERNOTFOUND)
                     type = Guid.Empty;
                 else
diff --git a/ProjectExtender/ProjectExtender.vsct b/ProjectExtender/ProjectExtender.vsct
index ce30878..7e71f6e 100644
--- a/ProjectExtender/ProjectExtender.vsct
+++ b/ProjectExtender/ProjectExtender.vsct
@@ -21,7 +21,7 @@
   <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"/>
+  <!--<Extern href="msobtnid.h"/>-->
 
   <!--#include "sharedids.h" -->
   <Extern href="sharedids.h"/>
diff --git a/ProjectExtender/ProjectExtender11.csproj b/ProjectExtender/ProjectExtender11.csproj
index 537c25c..a261a61 100644
--- a/ProjectExtender/ProjectExtender11.csproj
+++ b/ProjectExtender/ProjectExtender11.csproj
@@ -61,9 +61,10 @@
     <DefineConstants>TRACE;CODE_ANALYSIS;VS2010</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FSharp.ProjectSystem.Base, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
diff --git a/ProjectExtender/ProjectExtender11.sln b/ProjectExtender/ProjectExtender11.sln
index c1e5c5a..d9911fe 100644
--- a/ProjectExtender/ProjectExtender11.sln
+++ b/ProjectExtender/ProjectExtender11.sln
@@ -12,6 +12,7 @@ Global
 		{4C212D3D-B68F-4B2D-916B-E607B5AEA6A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C212D3D-B68F-4B2D-916B-E607B5AEA6A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C212D3D-B68F-4B2D-916B-E607B5AEA6A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C212D3D-B68F-4B2D-916B-E607B5AEA6A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ProjectExtender/source.extension.vsixmanifest b/ProjectExtender/source.extension.vsixmanifest
index ada0eec..4baacb8 100644
--- a/ProjectExtender/source.extension.vsixmanifest
+++ b/ProjectExtender/source.extension.vsixmanifest
@@ -8,7 +8,7 @@
         <Locale>1033</Locale>
         <InstalledByMsi>false</InstalledByMsi>
         <SupportedProducts>
-            <VisualStudio Version="10.0">
+            <VisualStudio Version="11.0">
                 <Edition>Pro</Edition>
             </VisualStudio>
         </SupportedProducts>
@@ -20,6 +20,6 @@
         </Reference>
     </References>
     <Content>
-        <VsPackage>ProjectExtender2010.pkgdef</VsPackage>
+        <VsPackage>ProjectExtender2011.pkgdef</VsPackage>
     </Content>
 </Vsix>