Skip to content

Commit 366ed83

Browse files
dsymedsyme
committed
do not try to build latest FSHarp.Core as part of proto build
1 parent 86a584d commit 366ed83

8 files changed

Lines changed: 22 additions & 9 deletions

File tree

‎FSharpBuild.Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
9393
<UseStandardResourceNames>false</UseStandardResourceNames>
9494
<GenerateDocumentationFile>true</GenerateDocumentationFile>
95+
<FSharpCoreProtoVersion>4.6.2</FSharpCoreProtoVersion>
9596
</PropertyGroup>
9697

9798
<!-- SDK targets override -->

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
36+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
37+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
38+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
3739
</ItemGroup>
3840

3941
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

‎src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
31+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
32+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
33+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
3234
</ItemGroup>
3335

3436
<ItemGroup>

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,9 @@
675675
</ItemGroup>
676676

677677
<ItemGroup>
678-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
678+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
679+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
680+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
679681
</ItemGroup>
680682

681683
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

‎src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
24+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
25+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
26+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
2527
</ItemGroup>
2628

2729
<ItemGroup>

‎src/fsharp/fsc/fsc.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
33-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Build\FSharp.Build.fsproj" />
34-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
32+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
33+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
34+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎src/fsharp/fsi/fsi.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
29+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
30+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
31+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
3032
<ProjectReference Include="..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
3133
<ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
3234

‎src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
29+
<ProjectReference Condition="'$(Configuration)' != 'Proto'" Include="..\FSharp.Core\FSharp.Core.fsproj" />
30+
<!-- when building the proto tools, use an FSharp.Core package - the latest FSharp.Core code may not build with the LKG compiler -->
31+
<PackageReference Condition="'$(Configuration)' == 'Proto'" Include="FSharp.Core" Version="$(FSharpCoreProtoVersion)" />
3032
<ProjectReference Include="..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
3133
<ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
3234
<ProjectReference Include="..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" />

0 commit comments

Comments
 (0)