Skip to content

Commit 41643ac

Browse files
committed
remove old #if
1 parent f3cdb73 commit 41643ac

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

src/fsharp/ReferenceResolution.fs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ module internal MSBuildResolver =
146146
/// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework.
147147
/// This is only used to specify the "last resort" path for assembly resolution.
148148
let GetPathToDotNetFrameworkImlpementationAssemblies(v) =
149-
#if FX_ATLEAST_45
150149
let v =
151150
match v with
152151
| Net11 -> Some TargetDotNetFrameworkVersion.Version11
@@ -166,14 +165,8 @@ module internal MSBuildResolver =
166165
| null -> []
167166
| x -> [x]
168167
| _ -> []
169-
#else
170-
// FX_ATLEAST_45 is not defined for step when we build compiler with proto compiler.
171-
ignore v
172-
[]
173-
#endif
174168

175169
let GetPathToDotNetFrameworkReferenceAssembliesFor40Plus(version) =
176-
#if FX_ATLEAST_45
177170
// starting with .Net 4.0, the runtime dirs (WindowsFramework) are never used by MSBuild RAR
178171
let v =
179172
match version with
@@ -190,26 +183,16 @@ module internal MSBuildResolver =
190183
| null -> []
191184
| x -> [x]
192185
| None -> []
193-
#else
194-
// FX_ATLEAST_45 is not defined for step when we build compiler with proto compiler.
195-
ignore version
196-
[]
197-
#endif
198186

199187
/// Use MSBuild to determine the version of the highest installed framework.
200188
let HighestInstalledNetFrameworkVersionMajorMinor() =
201-
#if FX_ATLEAST_45
202189
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version461)) <> null then 4, Net461
203190
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version46)) <> null then 4, Net46
204191
// 4.5.2 enumeration is not available in Dev15 MSBuild version
205192
//elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version452)) <> null then 4, Net452
206193
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451)) <> null then 4, Net451
207194
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version45)) <> null then 4, Net45
208195
else 4, Net40 // version is 4.0 assumed since this code is running.
209-
#else
210-
// FX_ATLEAST_45 is not defined is required for step when we build compiler with proto compiler and this branch should not be hit
211-
4, Net40
212-
#endif
213196

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

0 commit comments

Comments
 (0)