Commit83e2576

committed

Make sure assembly search paths for #r directives include directory of declaring source file

1 parent220c17d commit83e2576Copy full SHA for 83e2576

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2705,9 +2705,15 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =`
`2705`	`2705`	`letisNetModule= String.Compare(ext,".netmodule",StringComparison.OrdinalIgnoreCase)=0`
`2706`	`2706`	`if String.Compare(ext,".dll",StringComparison.OrdinalIgnoreCase)=0`
`2707`	`2707`	`\|\| String.Compare(ext,".exe",StringComparison.OrdinalIgnoreCase)=0`
`2708`		`-\|\| isNetModulethen`
	`2708`	`+\|\| isNetModulethen`
`2709`	`2709`
`2710`		`-letresolved= TryResolveFileUsingPaths(tcConfig.SearchPathsForLibraryFiles,m,nm)`
	`2710`	`+letsearchPaths=`
	`2711`	`+if m<> range0&& m<> rangeStartup&& m<> rangeCmdArgs&& FileSystem.IsPathRootedShim m.FileNamethen`
	`2712`	`+ tcConfig.SearchPathsForLibraryFiles@[Path.GetDirectoryName(m.FileName)]`
	`2713`	`+else`
	`2714`	`+ tcConfig.SearchPathsForLibraryFiles`
	`2715`	`+`
	`2716`	`+letresolved= TryResolveFileUsingPaths(searchPaths,m,nm)`
`2711`	`2717`	`match resolvedwith`
`2712`	`2718`	`\| Some(resolved)->`
`2713`	`2719`	`letsysdir= tcConfig.IsSystemAssembly resolved`

Comments

(0)