Skip to content

Merge master to release/dev16.8 #9781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 1 commit into from
Jul 25, 2020
Merged

Merge master to release/dev16.8 #9781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/fsharp/LegacyMSBuildReferenceResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ module LegacyMSBuildReferenceResolver
[<Literal>]
let private Net472 = "v4.7.2"

let SupportedDesktopFrameworkVersions = [ Net472; Net471; Net47; Net462; Net461; Net46; Net452; Net451; Net45 ]
[<Literal>]
let private Net48 = "v4.8"

let SupportedDesktopFrameworkVersions = [ Net48; Net472; Net471; Net47; Net462; Net461; Net46; Net452; Net451; Net45 ]

/// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework
/// This is only used to specify the "last resort" path for assembly resolution.
Expand All @@ -90,6 +93,7 @@ module LegacyMSBuildReferenceResolver
| Net47 -> Some TargetDotNetFrameworkVersion.Version47
| Net471 -> Some TargetDotNetFrameworkVersion.Version471
| Net472 -> Some TargetDotNetFrameworkVersion.Version472
| Net48 -> Some TargetDotNetFrameworkVersion.Version48
#endif
| _ -> assert false; None
match v with
Expand All @@ -116,7 +120,8 @@ module LegacyMSBuildReferenceResolver
try
// The Mono build still uses an ancient version of msbuild from around Dev 14
#if MSBUILD_AT_LEAST_15
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version472)) <> null then Net472
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version48)) <> null then Net48
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version472)) <> null then Net472
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version471)) <> null then Net471
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version47)) <> null then Net47
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version462)) <> null then Net462
Expand Down
6 changes: 5 additions & 1 deletion src/utils/reshapedmsbuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ module internal MsBuildAdapters =
| Version47 = 11
| Version471 = 12
| Version472 = 13
| VersionLatest = 13 //TargetDotNetFrameworkVersion.Version472
| Version48 = 14
| VersionLatest = 14 //TargetDotNetFrameworkVersion.Version48

/// <summary>
/// Used to specify the targeted bitness of the .NET Framework for some methods of ToolLocationHelper
Expand Down Expand Up @@ -126,6 +127,7 @@ module internal ToolLocationHelper =
let dotNetFrameworkVersion47 = Version(4, 7)
let dotNetFrameworkVersion471 = Version(4, 7, 1)
let dotNetFrameworkVersion472 = Version(4, 7, 2)
let dotNetFrameworkVersion48 = Version(4, 8)

// visual studio versions.
let visualStudioVersion100 = new Version(10, 0);
Expand Down Expand Up @@ -221,6 +223,7 @@ module internal ToolLocationHelper =
| TargetDotNetFrameworkVersion.Version47 -> dotNetFrameworkVersion47
| TargetDotNetFrameworkVersion.Version471 -> dotNetFrameworkVersion471
| TargetDotNetFrameworkVersion.Version472 -> dotNetFrameworkVersion472
| TargetDotNetFrameworkVersion.Version48 -> dotNetFrameworkVersion48
| _ -> raise (getArgumentException version)

let complusInstallRoot = Environment.GetEnvironmentVariable("COMPLUS_INSTALLROOT")
Expand Down Expand Up @@ -764,6 +767,7 @@ module internal ToolLocationHelper =
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion47 visualStudioVersion150 // v4.7
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion471 visualStudioVersion150 // v4.7.1
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion472 visualStudioVersion150 // v4.7.2
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion48 visualStudioVersion150 // v4.8
|]
array.ToDictionary<DotNetFrameworkSpec, Version>(fun spec -> spec.Version)

Expand Down