Skip to content

VS11 Beta compat changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fahadsuhaib wants to merge 1 commit into
base: master
Choose a base branch
from
Open

VS11 Beta compat changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ProjectExtender/Project/ItemList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ProjectExtender/ProjectExtender.vsct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
3 changes: 2 additions & 1 deletion ProjectExtender/ProjectExtender11.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions ProjectExtender/ProjectExtender11.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ProjectExtender/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Locale>1033</Locale>
<InstalledByMsi>false</InstalledByMsi>
<SupportedProducts>
<VisualStudio Version="10.0">
<VisualStudio Version="11.0">
<Edition>Pro</Edition>
</VisualStudio>
</SupportedProducts>
Expand All @@ -20,6 +20,6 @@
</Reference>
</References>
<Content>
<VsPackage>ProjectExtender2010.pkgdef</VsPackage>
<VsPackage>ProjectExtender2011.pkgdef</VsPackage>
</Content>
</Vsix>