Commiteeedc5e

committed

Merge branch 'master' into fsharp4

2 parents1880abf +c04666b commiteeedc5eCopy full SHA for eeedc5e

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2477,6 +2477,18 @@ See also ...\SetupAuthoring\FSharp\Registry\FSProjSys_Registration.wxs, e.g.`
`2477`	`2477`	`with get()=(x.Node:?> FSharpFileNode).SubType`
`2478`	`2478`	`andset(value)=(x.Node:?> FSharpFileNode).SubType<- value`
`2479`	`2479`
	`2480`	`+overridex.CreateDesignPropertyDescriptor propertyDescriptor=`
	`2481`	`+letisLinkFile=`
	`2482`	`+match x.Nodewith`
	`2483`	`+\|:? FSharpFileNodeas f-> f.IsLinkFile`
	`2484`	`+\|_->false`
	`2485`	`+`
	`2486`	`+letfileNameEditable=not isLinkFile`
	`2487`	`+`
	`2488`	`+if(not(fileNameEditable)&&(propertyDescriptor.Name="FileName"))`
	`2489`	`+then Microsoft.VisualStudio.Editors.PropertyPages.FilteredObjectWrapper.ReadOnlyPropertyDescriptorWrapper(propertyDescriptor):> PropertyDescriptor`
	`2490`	`+elsebase.CreateDesignPropertyDescriptor(propertyDescriptor)`
	`2491`	`+`
`2480`	`2492`
`2481`	`2493`	`and(* type*)`
`2482`	`2494`

Comments

(0)