Commit56610cc

authored and

committed

Install directory probed for assemblies when loading ResourceDictionary (#2968)

1 parent3711013 commit56610ccCopy full SHA for 56610cc

File tree

-3

lines changed

vsintegration/src/FSharp.Editor
- Common
  - AssemblyInfo.fs
- QuickInfo
  - Views.fs

-3

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,8 @@ open Microsoft.VisualStudio.Shell`
`14`	`14`
`15`	`15`	`do()`
`16`	`16`
	`17`	`+// This is needed to load XAML resource dictionaries from FSharp.UIResources assembly because ProvideCodeBase attribute does not work for that purpose.`
	`18`	`+// This adds $PackageFolder$ to the directories probed for assemblies to load.`
	`19`	`+// The attribute is inexplicably class-targeted, hence the dummy class.`
	`20`	`+[<ProvideBindingPath>]`
	`21`	`+typeprivateBindingPathForUIResources=classend`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,7 @@ type internal QuickInfoViewProvider`
`44`	`44`	`glyphService: IGlyphService`
`45`	`45`	`)=`
`46`	`46`
`47`		`-do Application.ResourceAssembly<- typeof<Microsoft.VisualStudio.FSharp.UIResources.Strings>.Assembly`
`48`		`-`
`49`		`-letstyles= ResourceDictionary(Source= Uri("HyperlinkStyles.xaml", UriKind.Relative))`
	`47`	`+letstyles= ResourceDictionary(Source= Uri(@"/FSharp.UIResources;component/HyperlinkStyles.xaml", UriKind.Relative))`
`50`	`48`
`51`	`49`	`letgetStyle():Style=`
`52`	`50`	`letkey=`

Comments

(0)