Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit1cb436a

Browse files
author
Kevin Ransom
committed
Fix Struct.ValueTuple on net 4.7.1
1 parent82e1d2f commit1cb436a

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

‎src/fsharp/CompileOps.fs‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,19 +1776,6 @@ let GetFSharpCoreLibraryName () = "FSharp.Core"
17761776
// If necessary assume a reference to the latest .NET Framework FSharp.Core with which those tools are built.
17771777
letGetDefaultFSharpCoreReference()= typeof<list<int>>.Assembly.Location
17781778

1779-
// If necessary assume a reference to the latest System.ValueTuple with which those tools are built.
1780-
letGetDefaultSystemValueTupleReference()=
1781-
#if COMPILER_SERVICE_AS_DLL
1782-
None// TODO, right now FCS doesn't add this reference automatically
1783-
#else
1784-
try
1785-
letasm= typeof<System.ValueTuple<int, int>>.Assembly
1786-
if asm.FullName.StartsWith"System.ValueTuple"then
1787-
Some asm.Location
1788-
else None
1789-
with_-> None
1790-
#endif
1791-
17921779
letGetFsiLibraryName()="FSharp.Compiler.Interactive.Settings"
17931780

17941781
// This list is the default set of references for "non-project" files.
@@ -1821,10 +1808,10 @@ let DefaultReferencesForScriptsAndOutOfProjectSources(assumeDotNetFramework) =
18211808
yield"System.Collections"// System.Collections.Generic.List<T>
18221809
yield"System.Runtime.Numerics"// BigInteger
18231810
yield"System.Threading"// OperationCanceledException
1824-
// always include a default reference to System.ValueTuple.dll in scripts and out-of-project sources
1825-
match GetDefaultSystemValueTupleReference()with
1826-
| None->()
1827-
| Some v->yield v
1811+
#if!COMPILER_SERVICE_AS_DLL
1812+
// TODO, right now FCS doesn't add this reference automatically
1813+
yield"System.ValueTuple"
1814+
#endif
18281815

18291816
yield"System.Web"
18301817
yield"System.Web.Services"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp