Skip to content

Commit b1b570c

Browse files
committed
use GetPathToStandardLibrary
1 parent d7033ef commit b1b570c

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

src/fsharp/ReferenceResolution.fs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -161,19 +161,9 @@ module internal MSBuildResolver =
161161

162162

163163
let GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(version) =
164-
// starting with .Net 4.0, the runtime dirs (WindowsFramework) are never used by MSBuild RAR
165-
let v =
166-
match version with
167-
| Net40 -> Some TargetDotNetFrameworkVersion.Version40
168-
| Net45 -> Some TargetDotNetFrameworkVersion.Version45
169-
| Net451 -> Some TargetDotNetFrameworkVersion.Version451
170-
| _ -> assert false; None // unknown version - some parts in the code are not synced
171-
match v with
172-
| Some v ->
173-
match ToolLocationHelper.GetPathToDotNetFrameworkReferenceAssemblies v with
174-
| null -> []
175-
| x -> [x]
176-
| None -> []
164+
match Microsoft.Build.Utilities.ToolLocationHelper.GetPathToStandardLibraries(".NETFramework",version,"") with
165+
| null | "" -> []
166+
| x -> [x]
177167

178168
/// Use MSBuild to determine the version of the highest installed framework.
179169
let HighestInstalledNetFrameworkVersionMajorMinor() =

0 commit comments

Comments
 (0)