Skip to content
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.

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

WIP: Optionally remove dependency on MSBuild reference resolution #649

Merged
merged 23 commits into from
Oct 13, 2016
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
integrate latest
  • Loading branch information
dsyme committed Oct 13, 2016
commit 1fe7435f641278c84c51d869c688ef6f2a66ba45
24 changes: 12 additions & 12 deletions src/fsharp/MSBuildReferenceResolver.fs
Original file line number Diff line number Diff line change
@@ -180,28 +180,28 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver

match resolvedFrom with
| AssemblyFolders ->
lineIfExists(resolvedPath)
+ lineIfExists(fusionName)
lineIfExists resolvedPath
+ lineIfExists fusionName
#if CROSS_PLATFORM_COMPILER
+ "Found by AssemblyFolders registry key"
#else
+ (FSComp.SR.assemblyResolutionFoundByAssemblyFoldersKey())
+ FSComp.SR.assemblyResolutionFoundByAssemblyFoldersKey()
#endif
| AssemblyFoldersEx ->
lineIfExists(resolvedPath)
+ lineIfExists(fusionName)
lineIfExists resolvedPath
+ lineIfExists fusionName
#if CROSS_PLATFORM_COMPILER
+ "Found by AssemblyFoldersEx registry key"
#else
+ (FSComp.SR.assemblyResolutionFoundByAssemblyFoldersExKey())
+ FSComp.SR.assemblyResolutionFoundByAssemblyFoldersExKey()
#endif
| TargetFrameworkDirectory ->
lineIfExists(resolvedPath)
+ lineIfExists(fusionName)
lineIfExists resolvedPath
+ lineIfExists fusionName
#if CROSS_PLATFORM_COMPILER
+ ".NET Framework"
#else
+ (FSComp.SR.assemblyResolutionNetFramework())
+ FSComp.SR.assemblyResolutionNetFramework()
#endif
| Unknown ->
// Unknown when resolved by plain directory search without help from MSBuild resolver.
@@ -210,13 +210,13 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver
| RawFileName ->
lineIfExists fusionName
| GlobalAssemblyCache ->
lineIfExists(fusionName)
lineIfExists fusionName
#if CROSS_PLATFORM_COMPILER
+ "Global Assembly Cache"
#else
+ (FSComp.SR.assemblyResolutionGAC())+ "\n"
+ lineIfExists (FSComp.SR.assemblyResolutionGAC())
#endif
+ lineIfExists(redist)
+ lineIfExists redist
| Path _ ->
lineIfExists resolvedPath
+ lineIfExists fusionName
12 changes: 2 additions & 10 deletions src/fsharp/ReferenceResolver.fs
Original file line number Diff line number Diff line change
@@ -34,11 +34,6 @@ type Resolver =
/// a .NET Framework version to use for scripts.
abstract HighestInstalledNetFrameworkVersion : unit -> string

/// Get the Reference Assemblies directory for the .NET Framework (on Windows)
/// This is added to the default resolution path for
/// design-time compilations.
abstract DotNetFrameworkReferenceAssembliesRootDirectory : string

/// Perform assembly resolution on the given references under the given conditions
abstract Resolve :
resolutionEnvironment: ResolutionEnvironment *
@@ -48,12 +43,9 @@ type Resolver =
targetFrameworkVersion:string *
targetFrameworkDirectories:string list *
targetProcessorArchitecture:string *
outputDirectory: string *
fsharpCoreDir:string *
explicitIncludeDirs:string list *
implicitIncludeDir:string *
logmessage:(string->unit) *
logwarning:(string->string->unit) *
logerror:(string->string->unit)
logMessage:(string->unit) *
logErrorOrWarning:(bool -> string -> string -> unit)
-> ResolvedFile[]

You are viewing a condensed version of this merge commit. You can view the full changes here.