Permalink
Browse files

fix up resolution of assembly references

  • Loading branch information...
1 parent ae23973 commit d6d96de96d4666013331133d9b9607eae6929148 @kongo2002 kongo2002 committed Apr 15, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 src/fsharp/build.fs
View
@@ -2996,19 +2996,23 @@ type TcAssemblyResolutions(results : AssemblyResolution list, unresolved : Unres
if tcConfig.framework then
for s in DefaultBasicReferencesForOutOfProjectSources do
+#if SILVERLIGHT
yield AssemblyReference(rangeStartup,s)
+#else
+ yield AssemblyReference(rangeStartup,s+".dll")
+#endif
if tcConfig.framework || tcConfig.addVersionSpecificFrameworkReferences then
// For out-of-project context, then always reference some extra DLLs on .NET 4.0, but not Silverlight 5.0
if tcConfig.MscorlibMajorVersion >= 4 && not (tcConfig.MscorlibMinorVersion = 0 && tcConfig.MscorlibRevisionVersion = 5) then
for s in DefaultBasicReferencesForOutOfProjectSources40 do
- yield AssemblyReference(rangeStartup,s+".dll")
+ yield AssemblyReference(rangeStartup,s+".dll")
if tcConfig.useFsiAuxLib then
#if SILVERLIGHT
let name = GetFsiLibraryName() //Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName())
#else
- let name = Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName()^".dll")
+ let name = Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName()+".dll")
#endif
yield AssemblyReference(rangeStartup,name)
yield! tcConfig.referencedDLLs ]

0 comments on commit d6d96de

Please sign in to comment.