diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index e5c32ea5a84872eed2f603ec3ae280b30bbd9623..8f1c6116e0c1ceaab90ef12f609bab7edde231c8 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -603,6 +603,10 @@ $(FSharpSourcesRoot)\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + $(FSharpSourcesRoot)\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + true + diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index a9276cdf0fe8af41fed2e9d532a7925263c5ba41..2a5e984e4e538fdcd14898e6c1757d3dcd9ac52a 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -3555,7 +3555,7 @@ type TcAssemblyResolutions(results : AssemblyResolution list, unresolved : Unres let assumeDotNetFramework = primaryReference.SimpleAssemblyNameIs("mscorlib") if tcConfig.framework then for s in DefaultReferencesForScriptsAndOutOfProjectSources(assumeDotNetFramework) do - yield AssemblyReference(rangeStartup,s+".dll",None) + yield AssemblyReference(rangeStartup,(if s.EndsWith(".dll") then s else s+".dll"),None) if tcConfig.useFsiAuxLib then let name = Path.Combine(tcConfig.fsharpBinariesDir, GetFsiLibraryName() + ".dll") diff --git a/tests/scripts/compiler-perf-results.txt b/tests/scripts/compiler-perf-results.txt index fba16527fd0933a6c05146fc555ed88f68803e42..984c1df04dd73cc17870b2fdf72e9f0439ac18f3 100644 --- a/tests/scripts/compiler-perf-results.txt +++ b/tests/scripts/compiler-perf-results.txt @@ -116,3 +116,5 @@ https://github.com/manofstick/visualfsharp.git manofstick-iseq-part2 8c1c https://github.com/jack-pappas/visualfsharp.git issue-1094 10c60c53d869e03be86b7815837cf6fd73c3095b ba63403cb5898596c5e875a14ce22b33ef618c01 195.12 11.73 30.09 46.20 63.30 52.68 https://github.com/dsyme/visualfsharp.git mem-tp-fix-1 0eb3de2961d80cce04e216614eb560ce12b6d459 ba63403cb5898596c5e875a14ce22b33ef618c01 200.28 10.38 30.20 46.68 61.81 51.27 https://github.com/Microsoft/visualfsharp master ba63403cb5898596c5e875a14ce22b33ef618c01 ba63403cb5898596c5e875a14ce22b33ef618c01 204.45 9.93 29.26 45.39 61.16 52.88 +https://github.com/manofstick/visualfsharp.git all-your-collections-are-belong-to-us 87dafbc17b494c438b6db9e59e064736bd8a44e2 ba63403cb5898596c5e875a14ce22b33ef618c01 221.58 11.19 31.91 48.23 66.05 52.99 +https://github.com/dsyme/visualfsharp.git acv1 e37c1a96f3a3069ef37fb4325eeb09385e419cb6 ba63403cb5898596c5e875a14ce22b33ef618c01 200.59 10.45 30.36 46.08 63.29 52.91