Skip to content

Commit 3f8b9b0

Browse files
committed
use GetPathToStandardLibrary
1 parent b1b570c commit 3f8b9b0

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/fsharp/ReferenceResolution.fs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ module internal MSBuildResolver =
160160
| _ -> []
161161

162162

163-
let GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(version) =
163+
let GetPathToDotNetFrameworkReferenceAssemblies(version) =
164164
match Microsoft.Build.Utilities.ToolLocationHelper.GetPathToStandardLibraries(".NETFramework",version,"") with
165165
| null | "" -> []
166166
| x -> [x]
@@ -178,13 +178,7 @@ module internal MSBuildResolver =
178178
if not(targetFrameworkVersion.StartsWith("v",StringComparison.Ordinal)) then "v"+targetFrameworkVersion
179179
else targetFrameworkVersion
180180

181-
let result =
182-
if targetFrameworkVersion.StartsWith(Net10, StringComparison.Ordinal) then ReplaceVariablesForLegacyFxOnWindows([@"{WindowsFramework}\v1.0.3705"])
183-
elif targetFrameworkVersion.StartsWith(Net11, StringComparison.Ordinal) then ReplaceVariablesForLegacyFxOnWindows([@"{WindowsFramework}\v1.1.4322"])
184-
elif targetFrameworkVersion.StartsWith(Net20, StringComparison.Ordinal) then ReplaceVariablesForLegacyFxOnWindows([@"{WindowsFramework}\v2.0.50727"])
185-
elif targetFrameworkVersion.StartsWith(Net30, StringComparison.Ordinal) then ReplaceVariablesForLegacyFxOnWindows([@"{ReferenceAssemblies}\v3.0"; @"{WindowsFramework}\v3.0"; @"{WindowsFramework}\v2.0.50727"])
186-
elif targetFrameworkVersion.StartsWith(Net35, StringComparison.Ordinal) then ReplaceVariablesForLegacyFxOnWindows([@"{ReferenceAssemblies}\v3.5"; @"{WindowsFramework}\v3.5"; @"{ReferenceAssemblies}\v3.0"; @"{WindowsFramework}\v3.0"; @"{WindowsFramework}\v2.0.50727"])
187-
else GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(targetFrameworkVersion)
181+
let result = GetPathToDotNetFrameworkReferenceAssemblies(targetFrameworkVersion)
188182

189183
let result = result |> Array.ofList
190184
logMessage (sprintf "Derived target framework directories for version %s are: %s" targetFrameworkVersion (String.Join(",", result)))

0 commit comments

Comments
 (0)