Skip to content

Commit 2f8266c

Browse files
nojafnojaf
committed
Use local JFCS
1 parent f97eb9c commit 2f8266c

File tree

16 files changed

+26
-22
lines changed

16 files changed

+26
-22
lines changed

‎ReSharper.FSharp/Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,12 @@
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+
<LocalFCSProject>$(MSBuildThisFileDirectory)../../fsharp/src/Compiler/FSharp.Compiler.Service.fsproj</LocalFCSProject>
3638
</PropertyGroup>
39+
40+
<ItemGroup>
41+
<PackageReference Condition="'$(UseLocalFSharpCompilerService)' == 'false'" Include="JetBrains.FSharp.Compiler.Service" />
42+
<ProjectReference Condition="'$(UseLocalFSharpCompilerService)' == 'true'" Include="$(LocalFCSProject)" />
43+
</ItemGroup>
3744
</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<ItemGroup>
2727
<PackageReference Include="FSharp.Core" />
2828
<PackageReference Include="JetBrains.Annotations" />
29-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
29+
3030
<PackageReference Include="JetBrains.Lifetimes" />
3131
<PackageReference Include="JetBrains.RdFramework" />
3232
</ItemGroup>
@@ -39,4 +39,4 @@
3939
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
4040
<Import Project="Sdk.targets" Sdk="JetBrains.Toolset.MainSolution.Sdk" Version="20200625.1.1.2" Condition="$(InternalBuild)" />
4141
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
42-
</Project>
42+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<ItemGroup>
7474
<PackageReference Include="FSharp.Core" />
7575
<PackageReference Include="JetBrains.Annotations" />
76-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
76+
7777
<PackageReference Include="JetBrains.HabitatDetector" />
7878
<PackageReference Include="JetBrains.Lifetimes" />
7979
<PackageReference Include="JetBrains.RdFramework" />

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

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

1717
<ItemGroup>
1818
<PackageReference Include="FSharp.Core" />
19-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
19+
2020
<PackageReference Include="JetBrains.Annotations" />
2121
<PackageReference Include="JetBrains.Lifetimes" />
2222
</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<ItemGroup>
125125
<PackageReference Include="FSharp.Core" />
126126
<PackageReference Include="JetBrains.Annotations" />
127-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
127+
128128
<PackageReference Include="JetBrains.Lifetimes" />
129129
<PackageReference Include="JetBrains.NuGet.Packaging" />
130130
<PackageReference Include="JetBrains.NuGet.Versioning" />
@@ -165,4 +165,4 @@
165165
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
166166
<Import Project="Sdk.targets" Sdk="JetBrains.NET.Sdk" Version="0.0.4" Condition="$(InternalBuild)" />
167167
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
168-
</Project>
168+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@
131131
</ItemGroup>
132132
<ItemGroup>
133133
<PackageReference Include="FSharp.Core" />
134-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
134+
135135
<PackageReference Include="JetBrains.Lifetimes" />
136136
</ItemGroup>
137137
<Import Project="$(RiderBackendSubplatform)" Condition="Exists('$(RiderBackendSubplatform)')" />
138138
<Import Project="$(SolutionDir)/GitHubActions.targets" Condition="$(RunningOnGitHubActions) == 'true'" />
139139
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
140140
<Import Project="Sdk.targets" Sdk="JetBrains.NET.Sdk" Version="0.0.4" Condition="$(InternalBuild)" />
141141
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
142-
</Project>
142+
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<ItemGroup>
8686
<PackageReference Include="FSharp.Core" />
8787
<PackageReference Include="JetBrains.Annotations" />
88-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
8988
<PackageReference Include="JetBrains.Lifetimes" />
9089
<PackageReference Include="JetBrains.RdFramework" />
9190
</ItemGroup>
@@ -94,4 +93,4 @@
9493
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
9594
<Import Project="Sdk.targets" Sdk="JetBrains.NET.Sdk" Version="0.0.4" Condition="$(InternalBuild)" />
9695
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
97-
</Project>
96+
</Project>

‎ReSharper.FSharp/src/FSharp/FSharp.Psi/FSharp.Psi.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<ItemGroup>
3333
<PackageReference Include="FSharp.Core" />
3434
<PackageReference Include="JetBrains.Annotations" />
35-
<PackageReference Include="JetBrains.FSharp.Compiler.Service" />
35+
3636
<PackageReference Include="JetBrains.Lifetimes" />
3737
<PackageReference Include="System.Collections.Immutable" />
3838
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
@@ -51,4 +51,4 @@
5151
<Import Project="ManagedProject.Generated.Targets" Condition="$(InternalBuild)" />
5252
<Import Project="Sdk.targets" Sdk="JetBrains.Toolset.MainSolution.Sdk" Version="20200625.1.1.2" Condition="$(InternalBuild)" />
5353
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="!$(InternalBuild)" />
54-
</Project>
54+
</Project>

0 commit comments

Comments
 (0)