Skip to content

Commit fbd52d5

Browse files
nojafnojaf
committed
Use local compiler.
1 parent e5d1bba commit fbd52d5

File tree

18 files changed

+18
-23
lines changed

18 files changed

+18
-23
lines changed

‎ReSharper.FSharp/Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,14 @@
3333
<PsiFeaturesTestSubplatform>$(Subplatform).Psi.Features_test_Framework.Props</PsiFeaturesTestSubplatform>
3434
<RdBackendCommonSubplatform>$(Subplatform).Rider_RdBackend.Common.Props</RdBackendCommonSubplatform>
3535
<RiderBackendSubplatform>$(Subplatform).Rider_Rider.Backend.Props</RiderBackendSubplatform>
36+
<UseLocalFSharpCompilerService>true</UseLocalFSharpCompilerService>
37+
<LocalFSharpRepository>$(MSBuildThisFileDirectory)../../fsharp</LocalFSharpRepository>
3638
</PropertyGroup>
39+
40+
<ItemGroup>
41+
<PackageReference Condition="'$(UseLocalFSharpCompilerService)' == 'false'" Include="JetBrains.FSharp.Compiler.Service" />
42+
<ProjectReference Condition="'$(UseLocalFSharpCompilerService)' == 'true'" Include="$(LocalFSharpRepository)/src/Compiler/FSharp.Compiler.Service.fsproj" />
43+
<ProjectReference Condition="'$(UseLocalFSharpCompilerService)' == 'true'" Include="$(LocalFSharpRepository)/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
44+
<ProjectReference Condition="'$(UseLocalFSharpCompilerService)' == 'true'" Include="$(LocalFSharpRepository)/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj" />
45+
</ItemGroup>
3746
</Project>

‎ReSharper.FSharp/TypeProviders.Host.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="FSharp.Core" />
17-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
17+
<PackageReference Condition="'$(UseLocalFSharpCompilerService)' == 'false'" Include="JetBrains.FSharp.Compiler.Service" />
1818
</ItemGroup>
1919

2020
</Project>

‎ReSharper.FSharp/src/FSharp.TypeProviders.Host/FSharp.TypeProviders.Host.NetCore/FSharp.TypeProviders.Host.NetCore.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<ItemGroup>
2626
<PackageReference Include="FSharp.Core" />
2727
<PackageReference Include="JetBrains.Annotations" />
28-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
2928
<PackageReference Include="JetBrains.Lifetimes" />
3029
<PackageReference Include="JetBrains.RdFramework" />
3130
<PackageReference Include="System.Diagnostics.Debug" />
@@ -46,4 +45,4 @@
4645
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
4746
<Import Project="Sdk.targets" Sdk="JetBrains.Toolset.MainSolution.Sdk" Version="20200625.1.1.2" Condition="$(InternalBuild)" />
4847
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
49-
</Project>
48+
</Project>

‎ReSharper.FSharp/src/FSharp.TypeProviders.Host/FSharp.TypeProviders.Host/FSharp.TypeProviders.Host.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<ItemGroup>
2727
<PackageReference Include="FSharp.Core" />
2828
<PackageReference Include="JetBrains.Annotations" />
29-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
3029
<PackageReference Include="JetBrains.Lifetimes" />
3130
<PackageReference Include="JetBrains.RdFramework" />
3231
</ItemGroup>
@@ -39,4 +38,4 @@
3938
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
4039
<Import Project="Sdk.targets" Sdk="JetBrains.Toolset.MainSolution.Sdk" Version="20200625.1.1.2" Condition="$(InternalBuild)" />
4140
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
42-
</Project>
41+
</Project>

‎ReSharper.FSharp/src/FSharp/FSharp.Common/FSharp.Common.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<ItemGroup>
7575
<PackageReference Include="FSharp.Core" />
7676
<PackageReference Include="JetBrains.Annotations" />
77-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
7877
<PackageReference Include="JetBrains.HabitatDetector" />
7978
<PackageReference Include="JetBrains.Lifetimes" />
8079
<PackageReference Include="JetBrains.RdFramework" />

‎ReSharper.FSharp/src/FSharp/FSharp.Common/src/Checker/FcsCheckerService.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ type FcsCheckerService(lifetime: Lifetime, logger: ILogger, onSolutionCloseNotif
276276

277277
member x.GetCachedScriptOptions(path) =
278278
if checker.IsValueCreated then
279-
checker.Value.GetCachedScriptOptions(path)
279+
None
280+
// TODO: checker.Value.GetCachedScriptOptions(path)
280281
else None
281282

282283
member x.InvalidateFcsProject(projectOptions: FSharpProjectOptions, invalidationType: FcsProjectInvalidationType) =

‎ReSharper.FSharp/src/FSharp/FSharp.ProjectModelBase/FSharp.ProjectModelBase.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="FSharp.Core" />
19-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
2019
<PackageReference Include="JetBrains.Annotations" />
2120
<PackageReference Include="JetBrains.Lifetimes" />
2221
</ItemGroup>

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/FSharp.Psi.Daemon.fsproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<ItemGroup>
8484
<PackageReference Include="FSharp.Core" />
8585
<PackageReference Include="JetBrains.Annotations" />
86-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
8786
<PackageReference Include="JetBrains.Lifetimes" />
8887
<PackageReference Include="JetBrains.RdFramework" />
8988
</ItemGroup>
@@ -92,4 +91,4 @@
9291
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
9392
<Import Project="Sdk.targets" Sdk="JetBrains.NET.Sdk" Version="0.0.4" Condition="$(InternalBuild)" />
9493
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
95-
</Project>
94+
</Project>

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/FSharp.Psi.Features.fsproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<ItemGroup>
125125
<PackageReference Include="FSharp.Core" />
126126
<PackageReference Include="JetBrains.Annotations" />
127-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
128127
<PackageReference Include="JetBrains.Lifetimes" />
129128
<PackageReference Include="JetBrains.NuGet.Packaging" />
130129
<PackageReference Include="JetBrains.NuGet.Versioning" />
@@ -165,4 +164,4 @@
165164
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
166165
<Import Project="Sdk.targets" Sdk="JetBrains.NET.Sdk" Version="0.0.4" Condition="$(InternalBuild)" />
167166
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
168-
</Project>
167+
</Project>

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/FSharp.Psi.Intentions.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
</ItemGroup>
143143
<ItemGroup>
144144
<PackageReference Include="FSharp.Core" />
145-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
146145
<PackageReference Include="JetBrains.Lifetimes" />
147146
</ItemGroup>
148147
<Import Project="$(RiderBackendSubplatform)" Condition="Exists('$(RiderBackendSubplatform)')" />

0 commit comments

Comments
 (0)