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

Commitf4f1408

Browse files
committed
fixes to mono paths
2 parents4c57bdd +2f78fc2 commitf4f1408

File tree

9 files changed

+8
-49
lines changed

9 files changed

+8
-49
lines changed

‎src/fsharp/CompileOps.fs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2818,7 +2818,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
28182818
letruntimeRootWithoutSlash= runtimeRoot.TrimEnd('/','\\')
28192819
letapi= runtimeRootWithoutSlash+"-api"
28202820
letrootFacades= Path.Combine(runtimeRootWithoutSlash,"Facades")
2821-
letfacades= Path.Combine(api,"Facades")
2821+
letapiFacades= Path.Combine(api,"Facades")
28222822
match tcConfig.resolutionEnvironmentwith
28232823
#if!FSI_TODO_NETCORE
28242824
// For F# Interactive code we must inly reference impementation assemblies
@@ -2828,10 +2828,14 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
28282828
yield rootFacades// System.Runtime.dll is in /usr/lib/mono/4.5/Facades
28292829
#endif
28302830
|_->
2831-
yield runtimeRoot// The default FSharp.Core is found in lib/mono/4.5
2831+
// The default FSharp.Core is found in lib/mono/4.5
2832+
yield runtimeRoot
2833+
if Directory.Exists(rootFacades)then
2834+
yield rootFacades// System.Runtime.dll is in /usr/lib/mono/4.5/Facades
2835+
// It's not clear why we would need to reference the 4.5-api directory.
28322836
if Directory.Exists(api)then
28332837
yield api
2834-
if Directory.Exists(facades)then
2838+
if Directory.Exists(apiFacades)then
28352839
yield facades
28362840
]
28372841
else

‎src/fsharp/ConstraintSolver.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2365,7 +2365,7 @@ and ResolveOverloading
23652365
letbestMethods=
23662366
applicableMeths|> List.choose(fun candidate->
23672367
if applicableMeths|> List.forall(fun other->
2368-
candidate=== other||// REVIEW: change this needless use of pointer equality to be an index comparison
2368+
p13candidate=== p13 other||// REVIEW: change this needless use of pointer equality to be an index comparison
23692369
letres= better candidate other
23702370
//eprintfn "\n-------\nCandidate: %s\nOther: %s\nResult: %d\n" (NicePrint.stringOfMethInfo amap m denv (fst candidate).Method) (NicePrint.stringOfMethInfo amap m denv (fst other).Method) res
23712371
res>0)then

‎vsintegration/src/FSharp.LanguageService.Base/InternalsVisibleTo.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,3 @@
1111
[assembly:InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
1212
[assembly:InternalsVisibleTo("FSharp.Editor, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
1313

14-
// Expose internals to testhook infrastructure and the test driver
15-
[assembly:InternalsVisibleTo("Tao.VSLanguages.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
16-
[assembly:InternalsVisibleTo("TNugget, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/InternalsVisibleTo.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@
77
[assembly:InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
88
[assembly:InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
99
[assembly:InternalsVisibleTo("FSharp.ProjectSystem.PropertyPages, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
10-
// Expose internals to testhook infrastructure and the test driver
11-
[assembly:InternalsVisibleTo("Tao.VSLanguages.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
12-
[assembly:InternalsVisibleTo("TNugget, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]

‎vsintegration/src/FSharp.ProjectSystem.FSharp/AssemblyInfo.fs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ open Microsoft.VisualStudio.Shell
99
[<assembly:InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
1010
[<assembly:InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
1111

12-
// For QA testdrivers and testhooks
13-
[<assembly:InternalsVisibleTo("Tao.VSLanguages.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
14-
[<assembly:InternalsVisibleTo("TNugget, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
15-
1612
[<assembly: ProvideCodeBase(CodeBase=@"$PackageFolder$\FSharp.ProjectSystem.FSharp.dll")>]
1713

1814
do()

‎vsintegration/src/FSharp.UIResources/InternalsVisibleTo.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,3 @@
1111
[assembly:InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
1212
[assembly:InternalsVisibleTo("FSharp.Editor, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
1313

14-
// Expose internals to testhook infrastructure and the test driver
15-
[assembly:InternalsVisibleTo("Tao.VSLanguages.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
16-
[assembly:InternalsVisibleTo("TNugget, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]

‎vsintegration/src/FSharp.VS.FSI/AssemblyInfo.fs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ open Microsoft.VisualStudio.Shell
1414
[<assembly: InternalsVisibleTo("FSharp.LanguageService.Base, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
1515
[<assembly: InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
1616

17-
// Expose internals to testhook infrastructure and the test driver
18-
[<assembly: InternalsVisibleTo("Tao.VSLanguages.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
19-
[<assembly: InternalsVisibleTo("TNugget, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
20-
[<assembly: InternalsVisibleTo("CompilerTestFacade, PublicKey=002400000480000094000000060200000024000052534131000400000100010069e72b918ad037cb584e6e4c5fb42c9130a755c4e4067826b9930c3737c7af5714f617ae728e3c3fdfeb5d233566fe01e5200f6a2a5a9f30b951d70048d4925503035a22e237b47f87bc35090258b9acf9f60ad35bf3b57ce343b3d4de3b9153324289053f43c1f38dd176a19d1c1796c4dbf00886e5539d3e12b38c7d440cf4")>]
21-
2217
[<assembly: ProvideCodeBase(CodeBase=@"$PackageFolder$\FSharp.VS.FSI.dll")>]
2318

2419
do()

‎vsintegration/tests/unittests/Tests.LanguageService.Completion.fs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5567,18 +5567,6 @@ let x = query { for bbbb in abbbbc(*D0*) do
55675567
letcompletions= DotCompletionAtStartOfMarker file"(*Mconstrainedtoint*)"
55685568
AssertCompListContainsAll(completions,["ToString"])
55695569

5570-
[<Test>]
5571-
[<Ignore("TODO tao test refactor")>]
5572-
memberthis.InternalNotVisibleInDiffAssembly()=
5573-
letfileContents="""
5574-
module CodeAccessibility
5575-
let type1 = new InternalNotVisibleInDiffAssembly.Module1.Type1()
5576-
type1(*MarkerDiffAssmb*)"""
5577-
let(solution,project,file)= this.CreateSingleFileProject(fileContents, references=["InternalNotVisibleDiffAssembly.Assembly.dll"])
5578-
5579-
letcompletions= DotCompletionAtStartOfMarker file"(*MarkerDiffAssmb*)"
5580-
AssertCompListDoesNotContainAny(completions,["fieldInternal";"MethodInternal"])
5581-
55825570
[<Test>]
55835571
memberthis.``Literal.Float``()=
55845572
this.VerifyDotCompListContainAllAtStartOfMarker(

‎vsintegration/tests/unittests/Tests.LanguageService.Script.fs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,21 +1556,6 @@ type UsingMSBuild() as this =
15561556
"#load\""// Unclosed
15571557
"#load\"Hello There\""]
15581558
)
1559-
1560-
//regression test for bug 2530
1561-
[<Test>]
1562-
[<Category("fsx moved from tao test")>]
1563-
memberpublicthis.``Fsx.IntellisenseForFSI``()=
1564-
letcode=
1565-
["module Script"
1566-
"fsi(*MarkerFSI*)"
1567-
]
1568-
let(_,script1)= createSingleFileFsxFromLines code
1569-
TakeCoffeeBreak(this.VS)
1570-
letmarker="(*MarkerFSI*)"
1571-
letlist=["FormatProvider";"CommandLineArgs"]
1572-
letcompletions= DotCompletionAtStartOfMarker script1 marker
1573-
AssertCompListContainsAll(completions, list)
15741559

15751560
[<Test>]
15761561
[<Category("TypeProvider")>]

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp