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

Commite6c9665

Browse files
committed
converge compiler DLLs
1 parent440f1a4 commite6c9665

File tree

8 files changed

+26
-18
lines changed

8 files changed

+26
-18
lines changed

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ all:
1515

1616
build-proto: restore
1717
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
1918
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
2019

2120
# The main targets
2221
build:
2322
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
2423
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
25-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler/FSharp.Compiler.Service.Internal.fsproj
2625
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
2726
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
2827
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj

‎src/fsharp/LegacyHostedCompilerForTesting.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ type internal InProcCompiler(legacyReferenceResolver) =
6565
{new Exiterwith
6666
memberthis.Exit n= exitCode:= n; raise StopProcessing}
6767
try
68-
typecheckAndCompile(ctok, argv, legacyReferenceResolver,false,false,false, exiter, loggerProvider.Provider, None, None)
68+
typecheckAndCompile(ctok, argv, legacyReferenceResolver,false,false,true, exiter, loggerProvider.Provider, None, None)
6969
with
7070
| StopProcessing->()
7171
| ReportedError_| WrappedError(ReportedError_,_)->

‎src/fsharp/SimulatedMSBuildReferenceResolver.fs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,17 @@ open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
1616

1717
letinternalSimulatedMSBuildResolver=
1818
{new Resolverwith
19-
member__.HighestInstalledNetFrameworkVersion()="v4.5"
19+
memberx.HighestInstalledNetFrameworkVersion()=
20+
letroot= x.DotNetFrameworkReferenceAssembliesRootDirectory
21+
if Directory.Exists(Path.Combine(RootBuilder,"v4.7"))then"v4.7"
22+
elif Directory.Exists(Path.Combine(RootBuilder,"v4.6.2"))then"v4.6.2"
23+
elif Directory.Exists(Path.Combine(RootBuilder,"v4.6.1"))then"v4.6.1"
24+
elif Directory.Exists(Path.Combine(RootBuilder,"v4.6"))then"v4.6"
25+
elif Directory.Exists(Path.Combine(RootBuilder,"v4.5.1"))then"v4.5.1"
26+
elif Directory.Exists(Path.Combine(RootBuilder,"v4.5"))then"v4.5"
27+
elif Directory.Exists(Path.Combine(RootBuilder,"v4.0"))then"v4.0"
28+
else"v4.5"
29+
2030
member__.DotNetFrameworkReferenceAssembliesRootDirectory=
2131
#if FX_RESHAPED_MSBUILD
2232
""

‎tests/service/ExprTests.fs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ open Microsoft.FSharp.Compiler.SourceCodeServices
2020
openFSharp.Compiler.Service
2121
openFSharp.Compiler.Service.Tests.Common
2222

23-
// Create an interactive checker instance
24-
letinternalchecker= FSharpChecker.Create(keepAssemblyContents=true)
23+
letinternalexprChecker= FSharpChecker.Create(keepAssemblyContents=true)
2524

2625

2726
[<AutoOpen>]
@@ -532,7 +531,7 @@ let bool2 = false
532531
#if EXTENSIONTYPING
533532
[<Test>]
534533
let``Test Declarations project1``()=
535-
letwholeProjectResults=checker.ParseAndCheckProject(Project1.options)|> Async.RunSynchronously
534+
letwholeProjectResults=exprChecker.ParseAndCheckProject(Project1.options)|> Async.RunSynchronously
536535

537536
for ein wholeProjectResults.Errorsdo
538537
printfn"Project1 error: <<<%s>>>" e.Message
@@ -852,12 +851,12 @@ let BigSequenceExpression(outFileOpt,docFileOpt,baseAddressOpt) =
852851

853852
letfileNames=[fileName1]
854853
letargs= mkProjectCommandLineArgs(dllName, fileNames)
855-
letoptions=checker.GetProjectOptionsFromCommandLineArgs(projFileName, args)
854+
letoptions=exprChecker.GetProjectOptionsFromCommandLineArgs(projFileName, args)
856855

857856

858857
[<Test>]
859858
let``Test expressions of declarations stress big expressions``()=
860-
letwholeProjectResults=checker.ParseAndCheckProject(ProjectStressBigExpressions.options)|> Async.RunSynchronously
859+
letwholeProjectResults=exprChecker.ParseAndCheckProject(ProjectStressBigExpressions.options)|> Async.RunSynchronously
861860

862861
wholeProjectResults.Errors.Length|> shouldEqual0
863862

@@ -882,7 +881,7 @@ let ``Check use of type provider that provides calls to F# code`` () =
882881

883882
letres=
884883
options
885-
|>checker.ParseAndCheckProject
884+
|>exprChecker.ParseAndCheckProject
886885
|> Async.RunSynchronously
887886

888887
Assert.AreEqual([||], res.Errors, sprintf"Should not be errors, but:%A" res.Errors)
@@ -1096,7 +1095,7 @@ let ``Test Declarations selfhost`` () =
10961095
letprojectFile=__SOURCE_DIRECTORY__+@"/FSharp.Compiler.Service.Tests.fsproj"
10971096
// Check with Configuration = Release
10981097
letoptions= ProjectCracker.GetProjectOptionsFromProjectFile(projectFile,[("Configuration","Debug")])
1099-
letwholeProjectResults=checker.ParseAndCheckProject(options)|> Async.RunSynchronously
1098+
letwholeProjectResults=exprChecker.ParseAndCheckProject(options)|> Async.RunSynchronously
11001099

11011100
wholeProjectResults.Errors.Length|> shouldEqual0
11021101

@@ -1121,7 +1120,7 @@ let ``Test Declarations selfhost whole compiler`` () =
11211120

11221121
//for x in options.OtherOptions do printfn "%s" x
11231122

1124-
letwholeProjectResults=checker.ParseAndCheckProject(options)|> Async.RunSynchronously
1123+
letwholeProjectResults=exprChecker.ParseAndCheckProject(options)|> Async.RunSynchronously
11251124

11261125
(wholeProjectResults.Errors|> Array.filter(fun x-> x.Severity= FSharpErrorSeverity.Error)).Length|> shouldEqual0
11271126

@@ -1154,7 +1153,7 @@ let ``Test Declarations selfhost FSharp.Core`` () =
11541153

11551154
letoptions= ProjectCracker.GetProjectOptionsFromProjectFile(projectFile,[("Configuration","Debug")])
11561155

1157-
letwholeProjectResults=checker.ParseAndCheckProject(options)|> Async.RunSynchronously
1156+
letwholeProjectResults=exprChecker.ParseAndCheckProject(options)|> Async.RunSynchronously
11581157

11591158
//(wholeProjectResults.Errors |> Array.filter (fun x -> x.Severity = FSharpErrorSeverity.Error)).Length |> shouldEqual 0
11601159

‎vsintegration/Utils/LanguageServiceProfiling/Program.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ let main argv =
6969
letgetLine line=(getFileLines()).[line]
7070

7171
eprintfn"Found options for%s." options.Options.ProjectFileName
72-
letchecker= FSharpChecker.Create(projectCacheSize=200, keepAllBackgroundResolutions=false)
73-
letwaste=new ResizeArray<int array>()
72+
letchecker= FSharpChecker.Create(projectCacheSize=200, keepAllBackgroundResolutions=false, legacyReferenceResolver=Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver)
73+
letwaste=new ResizeArray<int[]>()
7474

7575
letcheckProject():Async<FSharpCheckProjectResultsoption>=
7676
async{

‎vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type internal FSharpCheckerProvider
4646

4747
letchecker=
4848
lazy
49-
letchecker= FSharpChecker.Create(projectCacheSize=200, keepAllBackgroundResolutions=false(* , MaxMemory = 2300*))
49+
letchecker= FSharpChecker.Create(projectCacheSize=200, keepAllBackgroundResolutions=false(* , MaxMemory = 2300*), legacyReferenceResolver=MSBuildReferenceResolver.Resolver)
5050

5151
// This is one half of the bridge between the F# background builder and the Roslyn analysis engine.
5252
// When the F# background builder refreshes the background semantic build context for a file,

‎vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type internal FSharpLanguageServiceTestable() as this =
6868
memberthis.Initialize(sp,dp,prefs,sourceFact)=
6969
if this.Unhookedthen raise Error.UseOfUnhookedLanguageServiceState
7070
artifacts<- Some(ProjectSitesAndFiles())
71-
letchecker= FSharpChecker.Create()
71+
letchecker= FSharpChecker.Create(legacyReferenceResolver=Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver)
7272
checker.BeforeBackgroundFileCheck.Add(fun(filename,_)-> UIThread.Run(fun()-> this.NotifyFileTypeCheckStateIsDirty(filename)))
7373
checkerContainerOpt<- Some(checker)
7474
serviceProvider<- Some sp

‎vsintegration/tests/unittests/TestLib.LanguageService.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ open Microsoft.FSharp.Compiler.SourceCodeServices
1818

1919
[<AutoOpen>]
2020
moduleinternalGlobals=
21-
letchecker= FSharpChecker.Create()
21+
letchecker= FSharpChecker.Create(legacyReferenceResolver=Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver)
2222

2323
//open Internal.Utilities
2424
typeinternalTextSpan= Microsoft.VisualStudio.TextManager.Interop.TextSpan

0 commit comments

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