Skip to content

Commit aa5168f

Browse files
committed
use 4.5 framework by default
1 parent ee01069 commit aa5168f

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

src/fsharp/ReferenceResolution.fs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ module internal MSBuildResolver =
188188
#else
189189

190190
let GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(version) =
191-
#if FX_ATLEAST_45
192191
// starting with .Net 4.0, the runtime dirs (WindowsFramework) are never used by MSBuild RAR
193192
let v =
194193
match version with
@@ -202,24 +201,13 @@ module internal MSBuildResolver =
202201
| null -> []
203202
| x -> [x]
204203
| None -> []
205-
#else
206-
// FX_ATLEAST_45 is not defined for step when we build compiler with proto compiler.
207-
ignore version
208-
[]
209-
#endif
210204
#endif
211205

212-
#if CROSS_PLATFORM_COMPILER
213-
let HighestInstalledNetFrameworkVersionMajorMinor() =
214-
// Mono doesn't have GetPathToDotNetFramework
215-
4, Net40
216-
#else
217206
/// Use MSBuild to determine the version of the highest installed framework.
218207
let HighestInstalledNetFrameworkVersionMajorMinor() =
219208
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451)) <> null then 4, Net451
220209
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version45)) <> null then 4, Net45
221-
else 4, Net40 // version is 4.0 assumed since this code is running.
222-
#endif
210+
else 4, Net45 // version is 4.5 assumed since this code is running.
223211

224212
/// Derive the target framework directories.
225213
let DeriveTargetFrameworkDirectories (targetFrameworkVersion:string, logMessage) =

0 commit comments

Comments
 (0)