Skip to content

Commit bdcd8c9

Browse files
committed
Assume MSBuild 12
1 parent c5445a4 commit bdcd8c9

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/fsharp/ReferenceResolution.fs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,13 @@ module internal MSBuildResolver =
139139
//[<Literal>]
140140
//let private Net452 = "v4.5.2" // not available in Dev15 MSBuild version
141141

142+
#if MSBUILD_AT_LEAST_14
142143
[<Literal>]
143144
let private Net46 = "v4.6"
144145

145146
[<Literal>]
146147
let private Net461 = "v4.6.1"
148+
#endif
147149

148150
/// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework.
149151
/// This is only used to specify the "last resort" path for assembly resolution.
@@ -157,9 +159,11 @@ module internal MSBuildResolver =
157159
| Net40 -> Some TargetDotNetFrameworkVersion.Version40
158160
| Net45 -> Some TargetDotNetFrameworkVersion.Version45
159161
| Net451 -> Some TargetDotNetFrameworkVersion.Version451
162+
#if MSBUILD_AT_LEAST_14
160163
//| Net452 -> Some TargetDotNetFrameworkVersion.Version452 // not available in Dev15 MSBuild version
161164
| Net46 -> Some TargetDotNetFrameworkVersion.Version46
162165
| Net461 -> Some TargetDotNetFrameworkVersion.Version461
166+
#endif
163167
| _ -> assert false; None
164168
match v with
165169
| Some v ->
@@ -175,11 +179,15 @@ module internal MSBuildResolver =
175179

176180
/// Use MSBuild to determine the version of the highest installed framework.
177181
let HighestInstalledNetFrameworkVersionMajorMinor() =
182+
#if MSBUILD_AT_LEAST_14
178183
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version461)) <> null then 4, Net461
179184
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version46)) <> null then 4, Net46
180185
// 4.5.2 enumeration is not available in Dev15 MSBuild version
181186
//elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version452)) <> null then 4, Net452
182187
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451)) <> null then 4, Net451
188+
#else
189+
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451)) <> null then 4, Net451
190+
#endif
183191
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version45)) <> null then 4, Net45
184192
else 4, Net40 // version is 4.0 assumed since this code is running.
185193

0 commit comments

Comments
 (0)