diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props index 65cfa205e64..1abb6c8a95c 100644 --- a/FSharp.Profiles.props +++ b/FSharp.Profiles.props @@ -19,7 +19,6 @@ $(DefineConstants);FX_NO_WINFORMS $(DefineConstants);FX_NO_INDENTED_TEXT_WRITER $(DefineConstants);FX_RESHAPED_REFEMIT - $(DefineConstants);FX_RESHAPED_MSBUILD $(OtherFlags) --simpleresolution diff --git a/eng/Versions.props b/eng/Versions.props index 133af01d4fe..5860bae01c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 2.0.17 $(RoslynVersion) - 16.4 + 16.6 $(MicrosoftBuildOverallPackagesVersion) $(MicrosoftBuildOverallPackagesVersion) $(MicrosoftBuildOverallPackagesVersion) diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index a699625f201..52dffdf3cd5 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -283,9 +283,6 @@ AbsIL/ilreflect.fs - - ReferenceResolution/reshapedmsbuild.fs - ReferenceResolution/ReferenceResolver.fs diff --git a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj index ee8dbb00617..10140a10d00 100644 --- a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj +++ b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj @@ -103,7 +103,6 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp" file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.sigdata" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\FSharp.Build.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 file source="$(BinariesFolder)\Microsoft.DotNet.DependencyManager\$(Configuration)\net472\Microsoft.DotNet.DependencyManager.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 - file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.dll" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Framework.dll" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Tasks.Core.dll" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Utilities.Core.dll" diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index e1e21cb802c..5b1c5693769 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -22,7 +22,6 @@ - @@ -273,9 +272,6 @@ ReferenceResolution\ReferenceResolver.fs - - ReferenceResolution/reshapedmsbuild.fs - ReferenceResolution/LegacyMSBuildReferenceResolver.fsi @@ -740,10 +736,6 @@ - - - - @@ -772,6 +764,9 @@ + + + diff --git a/src/fsharp/FSharp.Core/string.fs b/src/fsharp/FSharp.Core/string.fs index d009615e6aa..4f73f15a99d 100644 --- a/src/fsharp/FSharp.Core/string.fs +++ b/src/fsharp/FSharp.Core/string.fs @@ -8,6 +8,7 @@ namespace Microsoft.FSharp.Core open Microsoft.FSharp.Core.Operators open Microsoft.FSharp.Core.Operators.Checked open Microsoft.FSharp.Collections + open Microsoft.FSharp.Primitives.Basics [] [] @@ -22,7 +23,25 @@ namespace Microsoft.FSharp.Core [] let concat sep (strings : seq) = - String.Join(sep, strings) + + let concatArray sep (strings: string []) = + match length sep with + | 0 -> String.Concat strings + // following line should be used when this overload becomes part of .NET Standard (it's only in .NET Core) + //| 1 -> String.Join(sep.[0], strings, 0, strings.Length) + | _ -> String.Join(sep, strings, 0, strings.Length) + + match strings with + | :? array as arr -> + concatArray sep arr + + | :? list as lst -> + lst + |> List.toArray + |> concatArray sep + + | _ -> + String.Join(sep, strings) [] let iter (action : (char -> unit)) (str:string) = @@ -52,13 +71,19 @@ namespace Microsoft.FSharp.Core [] let mapi (mapping: int -> char -> char) (str:string) = - if String.IsNullOrEmpty str then + let len = length str + if len = 0 then String.Empty else - let res = StringBuilder str.Length + let result = str.ToCharArray() let f = OptimizedClosures.FSharpFunc<_,_,_>.Adapt(mapping) - str |> iteri (fun i c -> res.Append(f.Invoke(i, c)) |> ignore) - res.ToString() + + let mutable i = 0 + while i < len do + result.[i] <- f.Invoke(i, result.[i]) + i <- i + 1 + + new String(result) [] let filter (predicate: char -> bool) (str:string) = diff --git a/src/fsharp/LegacyMSBuildReferenceResolver.fs b/src/fsharp/LegacyMSBuildReferenceResolver.fs index f711e38a94f..4fa0b680bdd 100644 --- a/src/fsharp/LegacyMSBuildReferenceResolver.fs +++ b/src/fsharp/LegacyMSBuildReferenceResolver.fs @@ -5,12 +5,6 @@ module LegacyMSBuildReferenceResolver open System open System.IO open System.Reflection - -#if FX_RESHAPED_MSBUILD - open FSharp.Compiler.MsBuildAdapters - open FSharp.Compiler.ToolLocationHelper -#endif - open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.ReferenceResolver open Microsoft.Build.Tasks @@ -137,7 +131,6 @@ module LegacyMSBuildReferenceResolver else Net45 // version is 4.5 assumed since this code is running. with _ -> Net45 -#if !FX_RESHAPED_MSBUILD // 1. First look to see if we can find the highest installed set of dotnet reference assemblies, if yes then select that framework // 2. Otherwise ask msbuild for the highestinstalled framework let checkFrameworkForReferenceAssemblies (dotNetVersion:string) = @@ -153,9 +146,6 @@ module LegacyMSBuildReferenceResolver match SupportedDesktopFrameworkVersions |> Seq.tryFind(fun v -> checkFrameworkForReferenceAssemblies v) with | Some v -> v | None -> getHighestInstalledDotNETFramework() -#else - getHighestInstalledDotNETFramework() -#endif /// Derive the target framework directories. let DeriveTargetFrameworkDirectories (targetFrameworkVersion:string, logMessage) = @@ -270,17 +260,10 @@ module LegacyMSBuildReferenceResolver let engine = { new IBuildEngine with member __.BuildProjectFile(projectFileName, targetNames, globalProperties, targetOutputs) = true -#if FX_RESHAPED_MSBUILD - member __.LogCustomEvent(e) = protect (fun () -> logMessage ((e.GetPropertyValue("Message")) :?> string)) - member __.LogErrorEvent(e) = protect (fun () -> logDiagnostic true ((e.GetPropertyValue("Code")) :?> string) ((e.GetPropertyValue("Message")) :?> string)) - member __.LogMessageEvent(e) = protect (fun () -> logMessage ((e.GetPropertyValue("Message")) :?> string)) - member __.LogWarningEvent(e) = protect (fun () -> logDiagnostic false ((e.GetPropertyValue("Code")) :?> string) ((e.GetPropertyValue("Message")) :?> string)) -#else member __.LogCustomEvent(e) = protect (fun () -> logMessage e.Message) member __.LogErrorEvent(e) = protect (fun () -> logDiagnostic true e.Code e.Message) member __.LogMessageEvent(e) = protect (fun () -> logMessage e.Message) member __.LogWarningEvent(e) = protect (fun () -> logDiagnostic false e.Code e.Message) -#endif member __.ColumnNumberOfTaskNode with get() = 1 member __.LineNumberOfTaskNode with get() = 1 member __.ContinueOnError with get() = true @@ -329,15 +312,10 @@ module LegacyMSBuildReferenceResolver |] let assemblies = -#if FX_RESHAPED_MSBUILD - ignore references - [||] -#else [| for (referenceName,baggage) in references -> let item = new Microsoft.Build.Utilities.TaskItem(referenceName) :> ITaskItem item.SetMetadata("Baggage", baggage) item |] -#endif let rar = ResolveAssemblyReference(BuildEngine=engine, TargetFrameworkDirectories=targetFrameworkDirectories, FindRelatedFiles=false, FindDependencies=false, FindSatellites=false, diff --git a/src/fsharp/SimulatedMSBuildReferenceResolver.fs b/src/fsharp/SimulatedMSBuildReferenceResolver.fs index bf5ffc092f0..a5ecbddf703 100644 --- a/src/fsharp/SimulatedMSBuildReferenceResolver.fs +++ b/src/fsharp/SimulatedMSBuildReferenceResolver.fs @@ -35,7 +35,6 @@ let private SimulatedMSBuildResolver = | None -> "v4.5" member __.DotNetFrameworkReferenceAssembliesRootDirectory = -#if !FX_RESHAPED_MSBUILD if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then let PF = match Environment.GetEnvironmentVariable("ProgramFiles(x86)") with @@ -43,7 +42,6 @@ let private SimulatedMSBuildResolver = | s -> s PF + @"\Reference Assemblies\Microsoft\Framework\.NETFramework" else -#endif "" member __.Resolve(resolutionEnvironment, references, targetFrameworkVersion, targetFrameworkDirectories, targetProcessorArchitecture, @@ -105,7 +103,6 @@ let private SimulatedMSBuildResolver = success r with e -> logWarningOrError false "SR001" (e.ToString()) -#if !FX_RESHAPED_MSBUILD // For this one we need to get the version search exactly right, without doing a load try if not found && r.StartsWithOrdinal("FSharp.Core, Version=") && Environment.OSVersion.Platform = PlatformID.Win32NT then @@ -120,7 +117,6 @@ let private SimulatedMSBuildResolver = if FileSystem.SafeExists trialPath then success trialPath with e -> logWarningOrError false "SR001" (e.ToString()) -#endif let isFileName = r.EndsWith("dll", StringComparison.OrdinalIgnoreCase) || @@ -136,7 +132,6 @@ let private SimulatedMSBuildResolver = success trialPath with e -> logWarningOrError false "SR001" (e.ToString()) -#if !FX_RESHAPED_MSBUILD try // Search the GAC on Windows if not found && not isFileName && Environment.OSVersion.Platform = PlatformID.Win32NT then @@ -178,7 +173,6 @@ let private SimulatedMSBuildResolver = if FileSystem.SafeExists trialPath then success trialPath with e -> logWarningOrError false "SR001" (e.ToString()) -#endif results.ToArray() } diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 62e3acaa7f2..688f787ec0b 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -1614,6 +1614,11 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d Some (g.array_set_info, [ety], argExprs) | "get_Item", [sty; _; _], _, [_; _] when isStringTy g sty -> Some (g.getstring_info, [], argExprs) + | "op_UnaryPlus", [aty], _, [_] -> + // Call Operators.id + let info = makeOtherIntrinsicValRef (fslib_MFOperators_nleref, "id", None, None, [vara], ([[varaTy]], varaTy)) + let tyargs = [aty] + Some (info, tyargs, argExprs) | _ -> None diff --git a/src/utils/reshapedmsbuild.fs b/src/utils/reshapedmsbuild.fs deleted file mode 100644 index 46b7c0125c5..00000000000 --- a/src/utils/reshapedmsbuild.fs +++ /dev/null @@ -1,890 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -namespace Microsoft.Build.Tasks -namespace Microsoft.Build.Utilities -namespace Microsoft.Build.Framework -namespace Microsoft.Build.BuildEngine - -#if FX_RESHAPED_MSBUILD - -namespace Microsoft.Build.Framework -open System.Collections - -type ITaskItem = - abstract member ItemSpec : string with get, set - abstract member MetadataNames : ICollection with get - abstract member MetadataCount : int with get - - abstract member GetMetadata : string -> string - abstract member SetMetadata : string*string -> unit - abstract member RemoveMetadata : string -> unit - abstract member CopyMetadataTo : ITaskItem -> unit - abstract member CloneCustomMetadata : IDictionary - -module Utilities = - open Microsoft.Build.Framework - open System - open System.Collections - open System.Reflection - - type System.Object with - member this.GetPropertyValue(propName) = this.GetType().GetProperty(propName, BindingFlags.Public).GetValue(this, null) - member this.SetPropertyValue(propName, propValue) = this.GetType().GetProperty(propName, BindingFlags.Public).SetValue(this, propValue, null) - member this.GetMethod(methodName, argTypes) = this.GetType().GetMethod(methodName, argTypes, [||]) - - type TaskItem (itemSpec:string) = - let assembly = Assembly.Load(new AssemblyName("Microsoft.Build.Utilities.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")) - let buildUtilitiesTaskType = assembly.GetType("Microsoft.Build.Utilities.Task") - let instance = Activator.CreateInstance(buildUtilitiesTaskType, [|itemSpec|]) - - interface ITaskItem with - member this.ItemSpec - with get () :string = (instance.GetPropertyValue("ItemSpec") :?> string) - and set (value:string) = (instance.SetPropertyValue("ItemSpec", value)); () - member this.MetadataNames - with get () :ICollection = (instance.GetPropertyValue("MetadataNames") :?> ICollection) - member this.MetadataCount - with get () :int = (instance.GetPropertyValue("MetadataCount") :?> int) - member this.CopyMetadataTo(iTaskItem) = - let m = buildUtilitiesTaskType.GetMethod("CopyMetadataTo", [| typeof |]) - m.Invoke(instance, [|iTaskItem :>obj|]) |> ignore - member this.CloneCustomMetadata = - let m = buildUtilitiesTaskType.GetMethod("CloneCustomMetadata", [||]) - (m.Invoke(instance,[||])) :?>IDictionary - member this.GetMetadata(metadataName) = - let m = buildUtilitiesTaskType.GetMethod("GetMetadata", [|typeof|]) - (m.Invoke(instance,[|metadataName|])) :?>string - member this.RemoveMetadata(metadataName) = - let m = buildUtilitiesTaskType.GetMethod("RemoveMetadata", [|typeof|]) - (m.Invoke(instance,[|metadataName|])) :?>string |>ignore - member this.SetMetadata(metadataName, metadataValue) = - let m = buildUtilitiesTaskType.GetMethod("SetMetadata", [|typeof;typeof|]) - (m.Invoke(instance,[|metadataName; metadataValue|])) |>ignore - -namespace FSharp.Compiler -open System -open System.Collections -open System.Collections.Concurrent -open System.IO -open System.Linq -open System.Runtime.Versioning -open FSComp -open Microsoft.Win32 -open Microsoft.Build.Framework.Utilities - -module internal MsBuildAdapters = - - /// - /// Used to specify the targeted version of the .NET Framework for some methods of ToolLocationHelper. This is meant to mimic - /// the official version here: https://source.dot.net/#q=TargetDotNetFrameworkVersion. - /// - type public TargetDotNetFrameworkVersion = - | Version11 = 0 - | Version20 = 1 - | Version30 = 2 - | Version35 = 3 - | Version40 = 4 - | Version45 = 5 - | Version451 = 6 - | Version46 = 7 - | Version461 = 8 - | Version452 = 9 - | Version462 = 10 - | Version47 = 11 - | Version471 = 12 - | Version472 = 13 - | Version48 = 14 - | VersionLatest = 14 //TargetDotNetFrameworkVersion.Version48 - - /// - /// Used to specify the targeted bitness of the .NET Framework for some methods of ToolLocationHelper - /// - type DotNetFrameworkArchitecture = - | Current = 0 // Indicates the .NET Framework that is currently being run under - | Bitness32 = 1 // Indicates the 32-bit .NET Framework - | Bitness64 = 2 // Indicates the 64-bit .NET Framework - -module internal ToolLocationHelper = - open Microsoft.Build.Framework - open System.Linq - open System.Reflection - open MsBuildAdapters - - let dotNetFrameworkIdentifier = ".NETFramework" - - // .net versions. - let dotNetFrameworkVersion11 = Version(1, 1) - let dotNetFrameworkVersion20 = Version(2, 0) - let dotNetFrameworkVersion30 = Version(3, 0) - let dotNetFrameworkVersion35 = Version(3, 5) - let dotNetFrameworkVersion40 = Version(4, 0) - let dotNetFrameworkVersion45 = Version(4, 5) - let dotNetFrameworkVersion451 = Version(4, 5, 1) - let dotNetFrameworkVersion452 = Version(4, 5, 2) - let dotNetFrameworkVersion46 = Version(4, 6) - let dotNetFrameworkVersion461 = Version(4, 6, 1) - let dotNetFrameworkVersion462 = Version(4, 6, 2) - 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); - let visualStudioVersion110 = new Version(11, 0); - let visualStudioVersion120 = new Version(12, 0); - let visualStudioVersion140 = new Version(14, 0); - let visualStudioVersion150 = new Version(15, 0); - - // keep this up-to-date; always point to the latest visual studio version. - let visualStudioVersionLatest = visualStudioVersion150; - - let dotNetFrameworkRegistryPath = "SOFTWARE\\Microsoft\\.NETFramework"; - let dotNetFrameworkSetupRegistryPath = "SOFTWARE\\Microsoft\\NET Framework Setup\\NDP"; - let dotNetFrameworkSetupRegistryInstalledName = "Install"; - - let fullDotNetFrameworkRegistryKey = "HKEY_LOCAL_MACHINE\\" + dotNetFrameworkRegistryPath; - let dotNetFrameworkAssemblyFoldersRegistryPath = dotNetFrameworkRegistryPath + "\\AssemblyFolders"; - let referenceAssembliesRegistryValueName = "All Assemblies In"; - - let dotNetFrameworkSdkInstallKeyValueV11 = "SDKInstallRootv1.1"; - let dotNetFrameworkVersionFolderPrefixV11 = "v1.1"; // v1.1 is for Everett. - let dotNetFrameworkVersionV11 = "v1.1.4322"; // full Everett version to pass to NativeMethodsShared.GetRequestedRuntimeInfo(). - let dotNetFrameworkRegistryKeyV11 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionV11; - - let dotNetFrameworkSdkInstallKeyValueV20 = "SDKInstallRootv2.0"; - let dotNetFrameworkVersionFolderPrefixV20 = "v2.0"; // v2.0 is for Whidbey. - let dotNetFrameworkVersionV20 = "v2.0.50727"; // full Whidbey version to pass to NativeMethodsShared.GetRequestedRuntimeInfo(). - let dotNetFrameworkRegistryKeyV20 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionV20; - - let dotNetFrameworkVersionFolderPrefixV30 = "v3.0"; // v3.0 is for WinFx. - let dotNetFrameworkVersionV30 = "v3.0"; // full WinFx version to pass to NativeMethodsShared.GetRequestedRuntimeInfo(). - let dotNetFrameworkAssemblyFoldersRegistryKeyV30 = dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30; - let dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; - - let fallbackDotNetFrameworkSdkRegistryInstallPath = "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows"; - let fallbackDotNetFrameworkSdkInstallKeyValue = "CurrentInstallFolder"; - - let dotNetFrameworkSdkRegistryPathForV35ToolsOnWinSDK70A = @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx35Tools-x86"; - let fullDotNetFrameworkSdkRegistryPathForV35ToolsOnWinSDK70A = "HKEY_LOCAL_MACHINE\\" + dotNetFrameworkSdkRegistryPathForV35ToolsOnWinSDK70A; - - let dotNetFrameworkSdkRegistryPathForV35ToolsOnManagedToolsSDK80A = @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx35Tools-x86"; - let fullDotNetFrameworkSdkRegistryPathForV35ToolsOnManagedToolsSDK80A = "HKEY_LOCAL_MACHINE\\" + dotNetFrameworkSdkRegistryPathForV35ToolsOnManagedToolsSDK80A; - - let dotNetFrameworkVersionFolderPrefixV35 = "v3.5"; // v3.5 is for Orcas. - let dotNetFrameworkRegistryKeyV35 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV35; - - let fullDotNetFrameworkSdkRegistryKeyV35OnVS10 = fullDotNetFrameworkSdkRegistryPathForV35ToolsOnWinSDK70A; - let fullDotNetFrameworkSdkRegistryKeyV35OnVS11 = fullDotNetFrameworkSdkRegistryPathForV35ToolsOnManagedToolsSDK80A; - - let dotNetFrameworkVersionFolderPrefixV40 = "v4.0"; - let ToolsVersionsRegistryPath = @"SOFTWARE\Microsoft\MSBuild\ToolsVersions"; // Path to the ToolsVersion definitions in the registry - - - let programFiles = Environment.GetEnvironmentVariable("ProgramFiles") - - let programFiles32 = - // On a 64 bit machine we always want to use the program files x86. If we are running as a 64 bit process then this variable will be set correctly - // If we are on a 32 bit machine or running as a 32 bit process then this variable will be null and the programFiles variable will be correct. - let programFilesX86 = Environment.GetEnvironmentVariable("ProgramFiles(x86)") - if programFilesX86 = null then - programFiles - else - programFilesX86 - - let programFilesX64 = - if String.Equals(programFiles, programFiles32) then - // either we're in a 32-bit window, or we're on a 32-bit machine. - // if we're on a 32-bit machine, ProgramW6432 won't exist - // if we're on a 64-bit machine, ProgramW6432 will point to the correct Program Files. - Environment.GetEnvironmentVariable("ProgramW6432"); - else - // 64-bit window on a 64-bit machine; %ProgramFiles% points to the 64-bit - // Program Files already. - programFiles; - - let getArgumentException version = - let _, msg = SR.toolLocationHelperUnsupportedFrameworkVersion(version.ToString()) - new ArgumentException(msg) - - let TargetDotNetFrameworkVersionToSystemVersion version = - match version with - | TargetDotNetFrameworkVersion.Version11 -> dotNetFrameworkVersion11 - | TargetDotNetFrameworkVersion.Version20 -> dotNetFrameworkVersion20 - | TargetDotNetFrameworkVersion.Version30 -> dotNetFrameworkVersion30 - | TargetDotNetFrameworkVersion.Version35 -> dotNetFrameworkVersion35 - | TargetDotNetFrameworkVersion.Version40 -> dotNetFrameworkVersion40 - | TargetDotNetFrameworkVersion.Version45 -> dotNetFrameworkVersion45 - | TargetDotNetFrameworkVersion.Version451 -> dotNetFrameworkVersion451 - | TargetDotNetFrameworkVersion.Version452 -> dotNetFrameworkVersion452 - | TargetDotNetFrameworkVersion.Version46 -> dotNetFrameworkVersion46 - | TargetDotNetFrameworkVersion.Version461 -> dotNetFrameworkVersion461 - | TargetDotNetFrameworkVersion.Version462 -> dotNetFrameworkVersion462 - | TargetDotNetFrameworkVersion.Version47 -> dotNetFrameworkVersion47 - | TargetDotNetFrameworkVersion.Version471 -> dotNetFrameworkVersion471 - | TargetDotNetFrameworkVersion.Version472 -> dotNetFrameworkVersion472 - | TargetDotNetFrameworkVersion.Version48 -> dotNetFrameworkVersion48 - | _ -> raise (getArgumentException version) - - let complusInstallRoot = Environment.GetEnvironmentVariable("COMPLUS_INSTALLROOT") - let complusVersion = Environment.GetEnvironmentVariable("COMPLUS_VERSION") - - type DotNetFrameworkSpec (version, dotNetFrameworkRegistryKey, dotNetFrameworkSetupRegistryInstalledName, dotNetFrameworkVersionFolderPrefix, dotNetFrameworkSdkRegistryToolsKey, dotNetFrameworkSdkRegistryInstallationFolderName, hasMSBuild, _vsVersion) = - - let _HKLM = "HKEY_LOCAL_MACHINE" - let _microsoftSDKsRegistryKey = @"SOFTWARE\Microsoft\Microsoft SDKs" - let dotNetFrameworkFolderPrefix = dotNetFrameworkVersionFolderPrefix - let frameworkName = FrameworkName(dotNetFrameworkIdentifier, version) - -#if !FX_NO_WIN_REGISTRY - let findRegistryValueUnderKey registryBaseKeyName registryKeyName registryView = - try - use baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, registryView) - use subKey = baseKey.OpenSubKey(registryBaseKeyName) - match subKey with - | null -> None - | _ as x -> - let keyValue = x.GetValue(registryKeyName) - match keyValue with - | null -> None - | _ as x -> Some (x.ToString()) - with _ -> None -#endif - - let findRegistryValueUnderKey registryBaseKeyName registryKeyName = -#if FX_NO_WIN_REGISTRY - ignore registryBaseKeyName - ignore registryKeyName - None -#else - findRegistryValueUnderKey registryBaseKeyName registryKeyName RegistryView.Default -#endif - let CheckForFrameworkInstallation registryEntryToCheckInstall registryValueToCheckInstall = - // Complus is not set we need to make sure the framework we are targeting is installed. Check the registry key before trying to find the directory. - // If complus is set then we will return that directory as the framework directory, there is no need to check the registry value for the framework and it may not even be installed. - - if (String.IsNullOrEmpty(complusInstallRoot) && String.IsNullOrEmpty(complusVersion)) then - - // If the registry entry is 1 then the framework is installed. Go ahead and find the directory. If it is not 1 then the framework is not installed, return null - - match findRegistryValueUnderKey registryEntryToCheckInstall registryValueToCheckInstall with - | None -> false - | Some x -> if String.Compare("1", x, StringComparison.OrdinalIgnoreCase) = 0 then true else false - - else true - - let PickDirectoryFromInstallRoot prefix (installRoot:string) arch = - let searchPattern = prefix + "*" - let calculatePath = - let bitness s = if arch = DotNetFrameworkArchitecture.Bitness64 then s + @"64\" else s + @"\" - let trim = if installRoot.EndsWith(@"\") then installRoot.Substring(0, installRoot.Length - 1) else installRoot - let i64 = trim.IndexOf("Framework64", StringComparison.OrdinalIgnoreCase) - if i64 = -1 then bitness trim else bitness (trim.Substring(0, i64 + 9)) - - if Directory.Exists(calculatePath) then - let directories = Directory.GetDirectories(calculatePath, searchPattern) |> Array.sort - if directories.Length = 0 then None - else - // We don't care which one we choose, but we want to be predictible. - // The intention here is to choose the alphabetical maximum. - let mutable max = directories |> Array.last - Some max - else - None - - let FindDotNetFrameworkPath prefix registryEntryToCheckInstall registryValueToCheckInstall arch = - // If the COMPLUS variables are set, they override everything -- that's the directory we want. - if String.IsNullOrEmpty(complusInstallRoot) || String.IsNullOrEmpty(complusVersion) then - // We haven't managed to use exact methods to locate the FX, Since we run on coreclr - // we can't guess where by using the currently executing runtime - let installRootFromReg = findRegistryValueUnderKey registryEntryToCheckInstall registryValueToCheckInstall - match installRootFromReg with - | None -> None - | Some x -> PickDirectoryFromInstallRoot prefix x arch - else - Some (Path.Combine(complusInstallRoot, complusVersion)) - - - /// - /// Take the parts of the Target framework moniker and formulate the reference assembly path based on the the following pattern: - /// For a framework and version: - /// $(TargetFrameworkRootPath)\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion) - /// For a subtype: - /// $(TargetFrameworkRootPath)\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\SubType\$(TargetFrameworkSubType) - /// e.g.NET Framework v4.0 would locate its reference assemblies in: - /// \Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0 - /// e.g.Silverlight v2.0 would locate its reference assemblies in: - /// \Program Files\Reference Assemblies\Microsoft\Framework\Silverlight\v2.0 - /// e.g.NET Compact Framework v3.5, subtype PocketPC would locate its reference assemblies in: - /// \Program Files\Reference Assemblies\Microsoft\Framework\.NETCompactFramework\v3.5\SubType\PocketPC - /// - /// The path to the reference assembly location - let GenerateReferenceAssemblyPath targetFrameworkRootPath (frameworkName:FrameworkName) = - match targetFrameworkRootPath with - | Some x -> - try - let basePath = Path.Combine(x, frameworkName.Identifier, "v" + frameworkName.Version.ToString()) - let withProfile root = - if not (String.IsNullOrEmpty(frameworkName.Profile)) then - Path.Combine(root, "Profile", frameworkName.Profile) - else root - Some (Path.GetFullPath(withProfile basePath) + @"\") - with _ -> - // The compiler does not see the massage above an as exception; - None - | _ -> None - - - /// - /// Generate the path to the program files reference assembly location by taking in the program files special folder and then - /// using that path to generate the path to the reference assemblies location. - /// - let generateProgramFilesReferenceAssemblyRoot = - try - Some(Path.GetFullPath( Path.Combine(programFiles32, "Reference Assemblies\\Microsoft\\Framework") )) - with _ -> - None - - let pathToDotNetFrameworkReferenceAssemblies = - match GenerateReferenceAssemblyPath generateProgramFilesReferenceAssemblyRoot frameworkName with - | Some x when Directory.Exists(x) -> x + @"\" - | _ -> "" - - - member this.Version = version - member this.dotNetFrameworkRegistryKey = dotNetFrameworkRegistryKey - member this.dotNetFrameworkSetupRegistryInstalledName = dotNetFrameworkSetupRegistryInstalledName - member this.dotNetFrameworkSdkRegistryToolsKey = dotNetFrameworkSdkRegistryToolsKey - member this.DotNetFrameworkSdkRegistryInstallationFolderName = dotNetFrameworkSdkRegistryInstallationFolderName - member this.HasMSBuild = hasMSBuild - - member this.pathsToDotNetFramework = new ConcurrentDictionary() - member this.pathsToDotNetFrameworkSdkTools = new ConcurrentDictionary() - member this.pathToWindowsSdk = "Todo: Review dow we really need this" - -// /// -// /// Gets the full registry key of this .net framework Sdk for the given visual studio version. -// /// i.e. "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools-x86" for .net v4.5 on VS11. -// /// -// public virtual string GetDotNetFrameworkSdkRootRegistryKey(VisualStudioSpec visualStudioSpec) -// { -// return string.Join(@"\", HKLM, MicrosoftSDKsRegistryKey, visualStudioSpec.DotNetFrameworkSdkRegistryKey, this.dotNetFrameworkSdkRegistryToolsKey); -// } - - // Doesn't need to be virtual @@@@@ - abstract member GetPathToDotNetFramework: DotNetFrameworkArchitecture -> string - default this.GetPathToDotNetFramework arch = - match this.pathsToDotNetFramework.TryGetValue arch with - | true, x -> x - | _ -> - if not (CheckForFrameworkInstallation this.dotNetFrameworkRegistryKey this.dotNetFrameworkSetupRegistryInstalledName) then null - else - // We're not installed and we haven't found this framework path yet -- so find it! - let fwp:string option = (FindDotNetFrameworkPath dotNetFrameworkFolderPrefix dotNetFrameworkRegistryKey this.dotNetFrameworkSetupRegistryInstalledName arch) - match fwp with - | Some x -> - // For .net frameworks that should have msbuild.exe is it there - if hasMSBuild && not (File.Exists(Path.Combine(x, "msbuild.exe"))) then null - else this.pathsToDotNetFramework.[arch] <- x; x - | _ -> null - - // Doesn't need to be virtual @@@@@ - /// - /// Gets the full path of reference assemblies folder. - /// i.e. "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\" for .net v4.5. - /// - abstract member GetPathToDotNetFrameworkReferenceAssemblies: string - default this.GetPathToDotNetFrameworkReferenceAssemblies = pathToDotNetFrameworkReferenceAssemblies - -// /// -// /// Gets the full path of .net framework sdk tools for the given visual studio version. -// /// i.e. "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\" for .net v4.5 on VS11. -// /// -// public virtual string GetPathToDotNetFrameworkSdkTools(VisualStudioSpec visualStudioSpec) -// { -// string cachedPath; -// if (this.pathsToDotNetFrameworkSdkTools.TryGetValue(visualStudioSpec.Version, out cachedPath)) -// { -// return cachedPath; -// } -// -// string registryPath = string.Join(@"\", MicrosoftSDKsRegistryKey, visualStudioSpec.DotNetFrameworkSdkRegistryKey, this.dotNetFrameworkSdkRegistryToolsKey); -// -// // For the Dev10 SDK, we check the registry that corresponds to the current process' bitness, rather than -// // always the 32-bit one the way we do for Dev11 and onward, since that's what we did in Dev10 as well. -// // As of Dev11, the SDK reg keys are installed in the 32-bit registry. -// RegistryView registryView = visualStudioSpec.Version == visualStudioVersion100 ? RegistryView.Default : RegistryView.Registry32; -// -// string generatedPathToDotNetFrameworkSdkTools = FindRegistryValueUnderKey( -// registryPath, -// this.dotNetFrameworkSdkRegistryInstallationFolderName, -// registryView); -// -// if (string.IsNullOrEmpty(generatedPathToDotNetFrameworkSdkTools)) -// { -// // Fallback mechanisms. -// -// // Try to find explicit fallback rule. -// // i.e. v4.5.1 on VS12 fallbacks to v4.5 on VS12. -// bool foundExplicitRule = false; -// for (int i = 0; i < s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools.GetLength(0); ++i) -// { -// var trigger = s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools[i, 0]; -// if (trigger.Item1 == this.version && trigger.Item2 == visualStudioSpec.Version) -// { -// foundExplicitRule = true; -// var fallback = s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools[i, 1]; -// generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion(fallback.Item1, fallback.Item2); -// break; -// } -// } -// -// // Otherwise, fallback to previous VS. -// // i.e. fallback to v110 if the current visual studio version is v120. -// if (!foundExplicitRule) -// { -// int index = Array.IndexOf(s_visualStudioSpecs, visualStudioSpec); -// if (index > 0) -// { -// // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. -// VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; -// generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion(this.version, fallbackVisualStudioSpec.Version); -// } -// } -// } -// -// if (string.IsNullOrEmpty(generatedPathToDotNetFrameworkSdkTools)) -// { -// // Fallback to "default" ultimately. -// generatedPathToDotNetFrameworkSdkTools = FallbackToDefaultPathToDotNetFrameworkSdkTools(this.version); -// } -// -// if (!string.IsNullOrEmpty(generatedPathToDotNetFrameworkSdkTools)) -// { -// this.pathsToDotNetFrameworkSdkTools[visualStudioSpec.Version] = generatedPathToDotNetFrameworkSdkTools; -// } -// -// return generatedPathToDotNetFrameworkSdkTools; -// } -// -// /// -// /// Gets the full path of .net framework sdk. -// /// i.e. "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\" for .net v4.5 on VS11. -// /// -// public virtual string GetPathToDotNetFrameworkSdk(VisualStudioSpec visualStudioSpec) -// { -// string pathToBinRoot = this.GetPathToDotNetFrameworkSdkTools(visualStudioSpec); -// pathToBinRoot = RemoveDirectories(pathToBinRoot, 2); -// return pathToBinRoot; -// } -// -// /// -// /// Gets the full path of reference assemblies folder. -// /// i.e. "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\" for .net v4.5. -// /// -// public virtual string GetPathToDotNetFrameworkReferenceAssemblies() -// { -// if (this.pathToDotNetFrameworkReferenceAssemblies == null) -// { -// // when a user requests the 40 reference assembly path we don't need to read the redist list because we will not be chaining so we may as well just -// // generate the path and save us some time. -// string referencePath = GenerateReferenceAssemblyPath(FrameworkLocationHelper.programFilesReferenceAssemblyLocation, this.FrameworkName); -// if (Directory.Exists(referencePath)) -// { -// this.pathToDotNetFrameworkReferenceAssemblies = FileUtilities.EnsureTrailingSlash(referencePath); -// }// } -// -// return this.pathToDotNetFrameworkReferenceAssemblies; -// } -// -// /// -// /// Gets the full path of the corresponding windows sdk shipped with this .net framework. -// /// i.e. "C:\Program Files (x86)\Windows Kits\8.0\" for v8.0 (shipped with .net v4.5 and VS11). -// /// -// public virtual string GetPathToWindowsSdk() -// { -// if (this.pathToWindowsSdk == null) -// { -// ErrorUtilities.VerifyThrowArgument(this.visualStudioVersion != null, "FrameworkLocationHelper.UnsupportedFrameworkVersionForWindowsSdk", this.version); -// -// var visualStudioSpec = GetVisualStudioSpec(this.visualStudioVersion); -// -// if (string.IsNullOrEmpty(visualStudioSpec.WindowsSdkRegistryKey) || string.IsNullOrEmpty(visualStudioSpec.WindowsSdkRegistryInstallationFolderName)) -// { -// ErrorUtilities.ThrowArgument("FrameworkLocationHelper.UnsupportedFrameworkVersionForWindowsSdk", this.version); -// } -// -// string registryPath = string.Join(@"\", MicrosoftSDKsRegistryKey, "Windows", visualStudioSpec.WindowsSdkRegistryKey); -// -// // As of Dev11, the SDK reg keys are installed in the 32-bit registry. -// this.pathToWindowsSdk = FindRegistryValueUnderKey( -// registryPath, -// visualStudioSpec.WindowsSdkRegistryInstallationFolderName, -// RegistryView.Registry32); -// } -// -// return this.pathToWindowsSdk; -// } -// -// protected static string FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion(Version dotNetFrameworkVersion, Version visualStudioVersion) -// { -// VisualStudioSpec visualStudioSpec; -// DotNetFrameworkSpec dotNetFrameworkSpec; -// if (s_visualStudioSpecDict.TryGetValue(visualStudioVersion, out visualStudioSpec) -// && s_dotNetFrameworkSpecDict.TryGetValue(dotNetFrameworkVersion, out dotNetFrameworkSpec) -// && visualStudioSpec.SupportedDotNetFrameworkVersions.Contains(dotNetFrameworkVersion)) -// { -// return dotNetFrameworkSpec.GetPathToDotNetFrameworkSdkTools(visualStudioSpec); -// } -// -// return null; -// } -// -// protected static string FallbackToDefaultPathToDotNetFrameworkSdkTools(Version dotNetFrameworkVersion) -// { -// if (dotNetFrameworkVersion.Major == 4) -// { -// return FrameworkLocationHelper.PathToV4ToolsInFallbackDotNetFrameworkSdk; -// } -// -// if (dotNetFrameworkVersion == dotNetFrameworkVersion35) -// { -// return FrameworkLocationHelper.PathToV35ToolsInFallbackDotNetFrameworkSdk; -// } -// -// return null; -// } -// } - - type DotNetFrameworkSpecLegacy (version, - dotNetFrameworkRegistryKey, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefix, - dotNetFrameworkSdkRegistryToolsKey, - dotNetFrameworkSdkRegistryInstallationFolderName, - hasMSBuild, - vsBuild) = - inherit DotNetFrameworkSpec (version, - dotNetFrameworkRegistryKey, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefix, - dotNetFrameworkSdkRegistryToolsKey, - dotNetFrameworkSdkRegistryInstallationFolderName, - hasMSBuild, - vsBuild) - - type DotNetFrameworkSpecV3 (version, - dotNetFrameworkRegistryKey, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefix, - dotNetFrameworkSdkRegistryToolsKey, - dotNetFrameworkSdkRegistryInstallationFolderName, - hasMSBuild, - vsBuild) = - inherit DotNetFrameworkSpec(version, - dotNetFrameworkRegistryKey, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefix, - dotNetFrameworkSdkRegistryToolsKey, - dotNetFrameworkSdkRegistryInstallationFolderName, - hasMSBuild, - vsBuild) - - -// { -// private string _pathToDotNetFrameworkSdkTools; -// -// public DotNetFrameworkSpecLegacy( -// Version version, -// string dotNetFrameworkRegistryKey, -// string dotNetFrameworkSetupRegistryInstalledName, -// string dotNetFrameworkVersionFolderPrefix, -// string dotNetFrameworkSdkRegistryInstallationFolderName, -// bool hasMSBuild) -// : base(version, -// dotNetFrameworkRegistryKey, -// dotNetFrameworkSetupRegistryInstalledName, -// dotNetFrameworkVersionFolderPrefix, -// null, -// dotNetFrameworkSdkRegistryInstallationFolderName, -// hasMSBuild) -// { -// } -// -// /// -// /// Gets the full registry key of this .net framework Sdk for the given visual studio version. -// /// i.e. "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework" for v1.1 and v2.0. -// /// -// public override string GetDotNetFrameworkSdkRootRegistryKey(VisualStudioSpec visualStudioSpec) -// { -// return FrameworkLocationHelper.fullDotNetFrameworkRegistryKey; -// } -// -// /// -// /// Gets the full path of .net framework sdk tools for the given visual studio version. -// /// -// public override string GetPathToDotNetFrameworkSdkTools(VisualStudioSpec visualStudioSpec) -// { -// if (_pathToDotNetFrameworkSdkTools == null) -// { -// _pathToDotNetFrameworkSdkTools = FindRegistryValueUnderKey( -// dotNetFrameworkRegistryPath, -// this.dotNetFrameworkSdkRegistryInstallationFolderName); -// } -// -// return _pathToDotNetFrameworkSdkTools; -// } -// -// /// -// /// Gets the full path of .net framework sdk, which is the full path of .net framework sdk tools for v1.1 and v2.0. -// /// -// public override string GetPathToDotNetFrameworkSdk(VisualStudioSpec visualStudioSpec) -// { -// return this.GetPathToDotNetFrameworkSdkTools(visualStudioSpec); -// } -// -// /// -// /// Gets the full path of reference assemblies folder, which is the full path of .net framework for v1.1 and v2.0. -// /// -// public override string GetPathToDotNetFrameworkReferenceAssemblies() -// { -// return this.GetPathToDotNetFramework(DotNetFrameworkArchitecture.Current); -// } -// } -// -// /// -// /// Specialized implementation for legacy .net framework v3.0 and v3.5. -// /// -// private class DotNetFrameworkSpecV3 : DotNetFrameworkSpec -// { -// public DotNetFrameworkSpecV3( -// Version version, -// string dotNetFrameworkRegistryKey, -// string dotNetFrameworkSetupRegistryInstalledName, -// string dotNetFrameworkVersionFolderPrefix, -// string dotNetFrameworkSdkRegistryToolsKey, -// string dotNetFrameworkSdkRegistryInstallationFolderName, -// bool hasMSBuild) -// : base(version, -// dotNetFrameworkRegistryKey, -// dotNetFrameworkSetupRegistryInstalledName, -// dotNetFrameworkVersionFolderPrefix, -// dotNetFrameworkSdkRegistryToolsKey, -// dotNetFrameworkSdkRegistryInstallationFolderName, -// hasMSBuild) -// { -// } -// -// /// -// /// Gets the full path of .net framework sdk. -// /// i.e. "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\" for .net v3.5 on VS11. -// /// -// public override string GetPathToDotNetFrameworkSdk(VisualStudioSpec visualStudioSpec) -// { -// string pathToBinRoot = this.GetPathToDotNetFrameworkSdkTools(visualStudioSpec); -// pathToBinRoot = RemoveDirectories(pathToBinRoot, 1); -// return pathToBinRoot; -// } -// -// /// -// /// Gets the full path of reference assemblies folder. -// /// i.e. "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\" for v3.5. -// /// -// public override string GetPathToDotNetFrameworkReferenceAssemblies() -// { -// if (this.pathToDotNetFrameworkReferenceAssemblies == null) -// { -// this.pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( -// dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.dotNetFrameworkFolderPrefix, -// referenceAssembliesRegistryValueName); -// -// if (this.pathToDotNetFrameworkReferenceAssemblies == null) -// { -// this.pathToDotNetFrameworkReferenceAssemblies = GenerateReferenceAssemblyDirectory(dotNetFrameworkFolderPrefix); -// } -// } -// -// return this.pathToDotNetFrameworkReferenceAssemblies; -// } -// } -// - - let CreateDotNetFrameworkSpecForV4 version visualStudioVersion = - new DotNetFrameworkSpec( - version, - dotNetFrameworkSetupRegistryPath + "\\v4\\Full", - "Install", - "v4.0", - "WinSDK-NetFx40Tools-x86", - "InstallationFolder", - true, - Some visualStudioVersion) - - let dotNetFrameworkSpecDict = - let array = [| - new DotNetFrameworkSpecLegacy(dotNetFrameworkVersion11, // v1.1 - dotNetFrameworkRegistryKeyV11, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefixV11, - dotNetFrameworkSdkInstallKeyValueV11, - "", - false, - None) :> DotNetFrameworkSpec - new DotNetFrameworkSpecLegacy( // v2.0 - dotNetFrameworkVersion20, - dotNetFrameworkRegistryKeyV20, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefixV20, - dotNetFrameworkSdkInstallKeyValueV20, - "", - true, - None) :> DotNetFrameworkSpec - new DotNetFrameworkSpecV3( // v3.0 - dotNetFrameworkVersion30, - dotNetFrameworkRegistryKeyV30, - "InstallSuccess", - dotNetFrameworkVersionFolderPrefixV30, - "", - "", - false, - None) :> DotNetFrameworkSpec - new DotNetFrameworkSpecV3( // v3.5 - dotNetFrameworkVersion35, - dotNetFrameworkRegistryKeyV35, - dotNetFrameworkSetupRegistryInstalledName, - dotNetFrameworkVersionFolderPrefixV35, - "WinSDK-NetFx35Tools-x86", - "InstallationFolder", - true, - None) :> DotNetFrameworkSpec - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion40 visualStudioVersion100 // v4.0 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion45 visualStudioVersion110 // v4.5 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion451 visualStudioVersion120 // v4.5.1 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion452 visualStudioVersion150 // v4.5.2 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion46 visualStudioVersion140 // v4.6 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion461 visualStudioVersion150 // v4.6.1 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion462 visualStudioVersion150 // v4.6.2 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion47 visualStudioVersion150 // v4.7 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion471 visualStudioVersion150 // v4.7.1 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion472 visualStudioVersion150 // v4.7.2 - CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion48 visualStudioVersion150 // v4.8 - |] - array.ToDictionary(fun spec -> spec.Version) - - let getDotNetFrameworkSpec version = - match dotNetFrameworkSpecDict.TryGetValue version with - | true, x -> x - | _ -> raise (getArgumentException version) - - // Get a fully qualified path to the framework's root directory. -// let GetPathToDotNetFramework version architecture = -// let frameworkVersion = TargetDotNetFrameworkVersionToSystemVersion version -// (getDotNetFrameworkSpec frameworkVersion).GetPathToDotNetFramework(architecture) - - - // Get a fully qualified path to the frameworks root directory. - let GetPathToDotNetFramework version = -// GetPathToDotNetFramework version DotNetFrameworkArchitecture.Current - let frameworkVersion = TargetDotNetFrameworkVersionToSystemVersion version - (getDotNetFrameworkSpec frameworkVersion).GetPathToDotNetFramework(DotNetFrameworkArchitecture.Current) - - /// - /// Returns the path to the reference assemblies location for the given framework version. - /// - /// Version of the targeted .NET Framework - /// Path string. - let GetPathToDotNetFrameworkReferenceAssemblies version = - let frameworkVersion = TargetDotNetFrameworkVersionToSystemVersion version - (getDotNetFrameworkSpec frameworkVersion).GetPathToDotNetFrameworkReferenceAssemblies - - type IBuildEngine = - abstract member BuildProjectFile : string*string[]*IDictionary*IDictionary -> bool - abstract member LogCustomEvent : (*CustomBuildEventArgs*) obj -> unit - abstract member LogErrorEvent : (*BuildErrorEventArgs*) obj -> unit - abstract member LogMessageEvent : (*BuildMessageEventArgs*) obj -> unit - abstract member LogWarningEvent : (*BuildMessageEventArgs*) obj -> unit - - // Properties - abstract member ColumnNumberOfTaskNode : int with get - abstract member ContinueOnError : bool with get - abstract member LineNumberOfTaskNode : int with get - abstract member ProjectFileOfTaskNode : string with get - -// let getPropertyValue instance propName = -// instance.GetType().GetProperty(propName, BindingFlags.Public).GetValue(instance, null) -// -// let setPropertyValue instance propName propValue= -// instance.GetType().GetPropserty(propName, BindingFlags.Public).SetValue(instance, propValue, null) - - type ResolveAssemblyReference () = - let assembly = Assembly.Load(new AssemblyName("Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")) - let resolveAssemblyReferenceType = assembly.GetType("Microsoft.Build.Tasks.ResolveAssemblyReference") - let instance = Activator.CreateInstance(resolveAssemblyReferenceType) - - member this.BuildEngine - with get ():IBuildEngine = (instance.GetPropertyValue("BuildEngine") :?> IBuildEngine) - and set (value:IBuildEngine) = (instance.SetPropertyValue("BuildEngine", value)); () - - member this.TargetFrameworkDirectories - with get ():string[] = (instance.GetPropertyValue("TargetFrameworkDirectories") :?> string[]) - and set (value:string[]) = (instance.SetPropertyValue("TargetFrameworkDirectories", value)); () - - member this.FindRelatedFiles - with get () :bool = (instance.GetPropertyValue("FindRelatedFiles") :?> bool) - and set (value:bool) = (instance.SetPropertyValue("FindRelatedFiles", value)); () - - member this.FindDependencies - with get ():bool = (instance.GetPropertyValue("FindDependencies") :?> bool) - and set (value:bool) = (instance.SetPropertyValue("FindDependencies", value)); () - - member this.FindSatellites - with get ():bool = (instance.GetPropertyValue("FindSatellites") :?> bool) - and set (value:bool) = (instance.SetPropertyValue("FindSatellites", value)); () - - member this.FindSerializationAssemblies - with get ():bool = (instance.GetPropertyValue("FindSerializationAssemblies") :?> bool) - and set (value:bool) = (instance.SetPropertyValue("FindSerializationAssemblies", value)); () - - member this.TargetedRuntimeVersion - with get ():string = (instance.GetPropertyValue("TargetedRuntimeVersion") :?> string) - and set (value:string) = (instance.SetPropertyValue("TargetedRuntimeVersion", value)); () - - member this.TargetProcessorArchitecture - with get ():string = (instance.GetPropertyValue("TargetProcessorArchitecture") :?> string) - and set (value:string) = (instance.SetPropertyValue("TargetProcessorArchitecture", value)); () - - member this.CopyLocalDependenciesWhenParentReferenceInGac - with get ():bool = (instance.GetPropertyValue("CopyLocalDependenciesWhenParentReferenceInGac") :?> bool) - and set (value:bool) = (instance.SetPropertyValue("CopyLocalDependenciesWhenParentReferenceInGac", value)); () - - member this.AllowedAssemblyExtensions - with get () :string[] = (instance.GetPropertyValue("AllowedAssemblyExtensions") :?> string[]) - and set (value:string[]) = (instance.SetPropertyValue("AllowedAssemblyExtensions", value)); () - - member this.Assemblies - with get ():ITaskItem[] = (instance.GetPropertyValue("Assemblies") :?> ITaskItem[]) - and set (value:ITaskItem[]) = (instance.SetPropertyValue("Assemblies", value)); () - - member this.CopyLocalFiles = (instance.GetPropertyValue("CopyLocalFiles") :?> ITaskItem[]) - - member this.RelatedFiles = (instance.GetPropertyValue("RelatedFiles") :?> ITaskItem[]) - - member this.ResolvedFiles = (instance.GetPropertyValue("ResolvedFiles") :?> ITaskItem[]) - - member this.ResolvedDependencyFiles = (instance.GetPropertyValue("ResolvedDependencyFiles") :?> ITaskItem[]) - - member this.SatelliteFiles = (instance.GetPropertyValue("SatelliteFiles") :?> ITaskItem[]) - - member this.ScatterFiles = (instance.GetPropertyValue("ScatterFiles") :?> ITaskItem[]) - - member this.SuggestedRedirects = (instance.GetPropertyValue("SuggestedRedirects") :?> ITaskItem[]) - - member this.SearchPaths - with get () :string[] = (instance.GetPropertyValue("SearchPaths") :?> string[]) - and set (value:string[]) = (instance.SetPropertyValue("SearchPaths", value)); () - - member this.Execute () = - let m = instance.GetType().GetMethod("Execute", [| |]) - m.Invoke(instance, [||]) :?> bool - -#endif diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/StringModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/StringModule.fs index 6c1b1360585..0e08d9662d4 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/StringModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/StringModule.fs @@ -23,31 +23,27 @@ type StringModule() = [] member this.Concat() = - let e1 = String.concat null ["foo"] - Assert.AreEqual("foo", e1) - - let e2 = String.concat "" [] - Assert.AreEqual("", e2) - - let e3 = String.concat "foo" [] - Assert.AreEqual("", e3) - - let e4 = String.concat "" [null] - Assert.AreEqual("", e4) - - let e5 = String.concat "" [""] - Assert.AreEqual("", e5) - - let e6 = String.concat "foo" ["bar"] - Assert.AreEqual("bar", e6) - - let e7 = String.concat "foo" ["bav";"baz"] - Assert.AreEqual("bavfoobaz", e7) - - let e8 = String.concat "foo" [null;"baz";null;"bar"] - Assert.AreEqual("foobazfoofoobar", e8) - - CheckThrowsArgumentNullException(fun () -> String.concat "foo" null |> ignore) + /// This tests the three paths of String.concat w.r.t. array, list, seq + let execTest f expected arg = + let r1 = f (List.toSeq arg) + Assert.AreEqual(expected, r1) + + let r2 = f (List.toArray arg) + Assert.AreEqual(expected, r2) + + let r3 = f arg + Assert.AreEqual(expected, r3) + + do execTest (String.concat null) "world" ["world"] + do execTest (String.concat "") "" [] + do execTest (String.concat "|||") "" [] + do execTest (String.concat "") "" [null] + do execTest (String.concat "") "" [""] + do execTest (String.concat "|||") "apples" ["apples"] + do execTest (String.concat " ") "happy together" ["happy"; "together"] + do execTest (String.concat "Me! ") "Me! No, you. Me! Me! Oh, them." [null;"No, you. ";null;"Oh, them."] + + CheckThrowsArgumentNullException(fun () -> String.concat "%%%" null |> ignore) [] member this.Iter() = @@ -103,11 +99,35 @@ type StringModule() = [] member this.MapI() = - let e1 = String.mapi (fun i c -> char(int c + i)) "foo" - Assert.AreEqual("fpq", e1) + let e1 = String.mapi (fun _ c -> c) "12345" + Assert.AreEqual("12345", e1) - let e2 = String.mapi (fun i c -> c) null - Assert.AreEqual("", e2) + let e2 = String.mapi (fun _ c -> c + char 1) "1" + Assert.AreEqual("2", e2) + + let e3 = String.mapi (fun _ c -> c + char 1) "AB" + Assert.AreEqual("BC", e3) + + let e4 = String.mapi (fun i c -> char(int c + i)) "hello" + Assert.AreEqual("hfnos", e4) + + let e5 = String.mapi (fun _ c -> c) null + Assert.AreEqual("", e5) + + let e6 = String.mapi (fun _ c -> c) String.Empty + Assert.AreEqual("", e6) + + let e7 = String.mapi (fun _ _ -> failwith "should not fail") null + Assert.AreEqual("", e7) + + let e8 = String.mapi (fun i _ -> if i = 1 then failwith "should not fail" else char i) "X" + Assert.AreEqual("\u0000", e8) + + // side-effect and "order of operation" test + let mutable x = 0 + let e9 = String.mapi (fun i c -> x <- x + i; c + char x) "abcde" + Assert.AreEqual(x, 10) + Assert.AreEqual(e9, "acfjo") [] member this.Filter() = diff --git a/tests/fsharp/Compiler/Language/CodeQuotationTests.fs b/tests/fsharp/Compiler/Language/CodeQuotationTests.fs new file mode 100644 index 00000000000..c3feb8277a4 --- /dev/null +++ b/tests/fsharp/Compiler/Language/CodeQuotationTests.fs @@ -0,0 +1,43 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler.UnitTests + +open NUnit.Framework +open FSharp.Test.Utilities.Compiler +open FSharp.Quotations.Patterns + +[] +module CodeQuotationsTests = + + [] + let ``Quotation on op_UnaryPlus(~+) compiles and runs`` () = + Fsx """ +open FSharp.Linq.RuntimeHelpers +open FSharp.Quotations.Patterns +open FSharp.Quotations.DerivedPatterns + +let eval q = LeafExpressionConverter.EvaluateQuotation q + +let inline f x = <@ (~+) x @> +let x = <@ f 1 @> +let y : unit = + match f 1 with + | Call(_, methInfo, _) when methInfo.Name = "op_UnaryPlus" -> + () + | e -> + failwithf "did not expect expression for 'y': %A" e +let z : unit = + match f 5 with + | (CallWithWitnesses(_, methInfo, methInfoW, _, _) as e) when methInfo.Name = "op_UnaryPlus" && methInfoW.Name = "op_UnaryPlus$W" -> + if ((eval e) :?> int) = 5 then + () + else + failwith "did not expect evaluation false" + | e -> + failwithf "did not expect expression for 'z': %A" e + """ + |> asExe + |> withOptions ["--langversion:preview"] + |> compileAndRun + + diff --git a/tests/fsharp/Compiler/Language/WitnessTests.fs b/tests/fsharp/Compiler/Language/WitnessTests.fs new file mode 100644 index 00000000000..67f383c7827 --- /dev/null +++ b/tests/fsharp/Compiler/Language/WitnessTests.fs @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler.UnitTests + +open NUnit.Framework +open FSharp.Test.Utilities.Compiler +open FSharp.Tests + +#if !NETCOREAPP + +[] +module WitnessTests = + + [] + let ``Witness expressions are created as a result of compiling the type provider tests`` () = + let dir = Core.getTestsDirectory "typeProviders/helloWorld" + Fsx (sprintf """ +#load @"%s" + """ (dir ++ "provider.fsx")) + |> asExe + |> ignoreWarnings + |> withOptions ["--langversion:preview"] + |> compile + |> shouldSucceed + |> ignore +#endif + + diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj index db41395b37c..1c4f337025d 100644 --- a/tests/fsharp/FSharpSuite.Tests.fsproj +++ b/tests/fsharp/FSharpSuite.Tests.fsproj @@ -41,6 +41,8 @@ + + diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files index 4343af2f328..ca2426e7221 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files @@ -18,9 +18,6 @@ $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Framework.$(MicrosoftBuildFrameworkVersion)\lib\net46\Microsoft.Build.Framework.dll - - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.$(MicrosoftBuildVersion)\lib\net46\Microsoft.Build.dll - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Utilities.Core.$(MicrosoftBuildUtilitiesCoreVersion)\lib\net46\Microsoft.Build.Utilities.Core.dll