Skip to content

Commit d7033ef

Browse files
committed
try using ToolHeper
1 parent 5e66118 commit d7033ef

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

src/fsharp/ReferenceResolution.fs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,6 @@ module internal MSBuildResolver =
139139
/// The list of supported .NET Framework version numbers, using the monikers of the Reference Assemblies folder.
140140
let SupportedNetFrameworkVersions = set [ Net20; Net30; Net35; Net40; Net45; Net451; (*SL only*) "v5.0" ]
141141

142-
#if __IGNORE_CROSS_PLATFORM_COMPILER
143-
// Mono doesn't have GetPathToDotNetFramework. In this case we simply don't search this extra directory.
144-
// When the x-plat compiler is run on Mono this is ok since implementation assembly folder is the same as the target framework folder.
145-
// When the x-plat compiler is run on Windows/.NET this will curently cause slightly divergent behaviour.
146-
let GetPathToDotNetFrameworkImlpementationAssemblies _v = []
147-
#else
148142
/// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework.
149143
/// This is only used to specify the "last resort" path for assembly resolution.
150144
let GetPathToDotNetFrameworkImlpementationAssemblies(v) =
@@ -164,23 +158,8 @@ module internal MSBuildResolver =
164158
| null -> []
165159
| x -> [x]
166160
| _ -> []
167-
#endif
168161

169162

170-
#if __IGNORE_CROSS_PLATFORM_COMPILER
171-
// ToolLocationHelper.GetPathToDotNetFrameworkReferenceAssemblies is not available on Mono.
172-
// We currently use the old values that the F# 2.0 compiler assumed.
173-
// When the x-plat compiler is run on Mono this is ok since the asemblies are all in the framework folder
174-
// When the x-plat compiler is run on Windows/.NET this will curently cause slightly divergent behaviour this directory
175-
// may not be the same as the Microsoft compiler in all cases.
176-
let GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(version) =
177-
match version with
178-
| Net40 -> ReplaceVariablesForLegacyFxOnWindows([@"{ReferenceAssemblies}\v4.0"])
179-
| Net45 -> ReplaceVariablesForLegacyFxOnWindows([@"{ReferenceAssemblies}\v4.5"])
180-
| Net451 -> ReplaceVariablesForLegacyFxOnWindows([@"{ReferenceAssemblies}\v4.5.1"])
181-
| _ -> []
182-
#else
183-
184163
let GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(version) =
185164
// starting with .Net 4.0, the runtime dirs (WindowsFramework) are never used by MSBuild RAR
186165
let v =
@@ -195,7 +174,6 @@ module internal MSBuildResolver =
195174
| null -> []
196175
| x -> [x]
197176
| None -> []
198-
#endif
199177

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

0 commit comments

Comments
 (0)