Commita8f7831

committed

Merge pull requestfsharp#17 from kongo2002/reference_fix

fix up resolution of assembly references

2 parents5090d51 +063f241 commita8f7831Copy full SHA for a8f7831

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2996,19 +2996,23 @@ type TcAssemblyResolutions(results : AssemblyResolution list, unresolved : Unres`
`2996`	`2996`
`2997`	`2997`	`if tcConfig.frameworkthen`
`2998`	`2998`	`for sin DefaultBasicReferencesForOutOfProjectSourcesdo`
	`2999`	`+#if SILVERLIGHT`
`2999`	`3000`	`yield AssemblyReference(rangeStartup,s)`
	`3001`	`+#else`
	`3002`	`+yield AssemblyReference(rangeStartup,s+".dll")`
	`3003`	`+#endif`
`3000`	`3004`
`3001`	`3005`	`if tcConfig.framework\|\| tcConfig.addVersionSpecificFrameworkReferencesthen`
`3002`	`3006`	`// For out-of-project context, then always reference some extra DLLs on .NET 4.0, but not Silverlight 5.0`
`3003`	`3007`	`if tcConfig.MscorlibMajorVersion>=4&&not(tcConfig.MscorlibMinorVersion=0&& tcConfig.MscorlibRevisionVersion=5)then`
`3004`	`3008`	`for sin DefaultBasicReferencesForOutOfProjectSources40do`
`3005`		`-yield AssemblyReference(rangeStartup,s+".dll")`
	`3009`	`+yield AssemblyReference(rangeStartup,s+".dll")`
`3006`	`3010`
`3007`	`3011`	`if tcConfig.useFsiAuxLibthen`
`3008`	`3012`	`#if SILVERLIGHT`
`3009`	`3013`	`letname= GetFsiLibraryName()//Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName())`
`3010`	`3014`	`#else`
`3011`		`-letname= Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName()^".dll")`
	`3015`	`+letname= Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName()+".dll")`
`3012`	`3016`	`#endif`
`3013`	`3017`	`yield AssemblyReference(rangeStartup,name)`
`3014`	`3018`	`yield! tcConfig.referencedDLLs]`

Comments

(0)