Commite432d6b

authored and

committed

null check in project system (dotnet#2248)

* null check in project system* Fix hierarchy null exceptionConflicts:vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs

1 parent0eb04a4 commite432d6bCopy full SHA for e432d6b

File tree

-0

lines changed

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,9 @@ private static FrameworkCompatibility CheckFrameworksCompatibility(ProjectNode t`
`832`	`832`	`{`
`833`	`833`	`// copying logic from C#'s project system, langref.cpp: IsProjectReferenceReferenceable()`
`834`	`834`	`varotherFrameworkName=GetProjectTargetFrameworkName(thisProject.Site,referencedProjectGuid);`
	`835`	`+if(otherFrameworkName==null)`
	`836`	`+returnFrameworkCompatibility.Ok;`
	`837`	`+`
`835`	`838`	`if(String.Compare(otherFrameworkName.Identifier,".NETPortable",StringComparison.OrdinalIgnoreCase)==0)`
`836`	`839`	`{`
`837`	`840`	`// we always allow references to projects that are targeted to the Portable/".NETPortable" fx family`
`@@ -865,7 +868,11 @@ private static FrameworkCompatibility CheckFrameworksCompatibility(ProjectNode t`
`865`	`868`	`privatestaticSystem.Runtime.Versioning.FrameworkNameGetProjectTargetFrameworkName(System.IServiceProviderserviceProvider,GuidreferencedProjectGuid)`
`866`	`869`	`{`
`867`	`870`	`varhierarchy=VsShellUtilities.GetHierarchy(serviceProvider,referencedProjectGuid);`
	`871`	`+if(hierarchy==null)`
	`872`	`+returnnull;`
	`873`	`+`
`868`	`874`	`objectotherTargetFrameworkMonikerObj;`
	`875`	`+`
`869`	`876`	`hierarchy.GetProperty(VSConstants.VSITEMID_ROOT,(int)__VSHPROPID4.VSHPROPID_TargetFrameworkMoniker,outotherTargetFrameworkMonikerObj);`
`870`	`877`
`871`	`878`	`stringtargetFrameworkMoniker=(string)otherTargetFrameworkMonikerObj;`

Comments

(0)