From 76a6ab9aab6b42dd9f104cae19638b97162ab48b Mon Sep 17 00:00:00 2001
From: Eugene Auduchinok <eugene.auduchinok@jetbrains.com>
Date: Thu, 1 Sep 2022 17:55:12 +0200
Subject: [PATCH 1/4] Allow using FSharp.Core package in new service solution
 projects

---
 Directory.Build.props                                    | 9 +++++++++
 .../BenchmarkComparison/HistoricalBenchmark.fsproj       | 9 ++++++++-
 .../FSharp.Compiler.Benchmarks.fsproj                    | 9 ++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index de4eb4723e5..0d93c757059 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,6 +3,15 @@
   <Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
   <Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
 
+  <!-- 
+   When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
+   This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local
+   FSharp.Core project.
+   -->
+  <PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">
+    <FSHARPCORE_USE_PACKAGE Condition="'$(SolutionName)' == 'FSharp.Compiler.Service'">true</FSHARPCORE_USE_PACKAGE>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
     <None Include="README.md" Condition="Exists('README.md')" />
diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
index c6d34718fcc..6459e8b4839 100644
--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
@@ -40,7 +40,6 @@
   <!-- Reference a project -->
   <ItemGroup Condition="'$(FcsReferenceType)' == 'project'">
     <ProjectReference Include="$(FcsProjectPath)" />
-    <ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
   <!-- Reference the FCS NuGet package with the specified $FcsVersion, use locally built FSharp.Core
        Arguably this could be changed to depend on the version of FSharp.Core that's pulled in via FSharp.Compiler.Service.
@@ -48,8 +47,16 @@
   -->
   <ItemGroup Condition=" '$(FcsReferenceType)' == 'nuget' ">
     <PackageReference Include="FSharp.Compiler.Service" Version="$(FcsNuGetVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
     <ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
+    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
+  </ItemGroup>
+
   <!-- Reference the dlls specified in $FcsDllPath and $FSharpCoreDllPath -->
   <ItemGroup Condition=" '$(FcsReferenceType)' == 'dll' ">
     <Reference Include="FSharp.Compiler.Service">
diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
index 927a7cee750..fb87915f15d 100644
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
@@ -27,8 +27,15 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Compiler\FSharp.Compiler.Service.fsproj" />
-    <ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="..\BenchmarkComparison\HistoricalBenchmark.fsproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
+    <ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
+    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
+  </ItemGroup>
+
 </Project>

From 4f72a968be130a5900fca1bfd33d0ef811ce1165 Mon Sep 17 00:00:00 2001
From: Eugene Auduchinok <eugene.auduchinok@jetbrains.com>
Date: Thu, 1 Sep 2022 17:56:27 +0200
Subject: [PATCH 2/4] Remove inner rules

---
 src/Directory.Build.props | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5950a28ad0f..68eba530bc9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,15 +2,6 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
-  <!-- 
-    When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
-    This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local
-    FSharp.Core project.
-  -->
-  <PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">
-    <FSHARPCORE_USE_PACKAGE Condition="'$(SolutionName)' == 'FSharp.Compiler.Service'">true</FSHARPCORE_USE_PACKAGE>
-  </PropertyGroup>
-
   <PropertyGroup>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseStandardResourceNames>false</UseStandardResourceNames>

From 81db8868be54daeebd5bb701f8cb03435c26b1eb Mon Sep 17 00:00:00 2001
From: Eugene Auduchinok <eugene.auduchinok@jetbrains.com>
Date: Fri, 2 Sep 2022 14:31:46 +0200
Subject: [PATCH 3/4] Another FSharp.Core reference

---
 .../FSharp.Compiler.ComponentTests.fsproj                | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
index d8bd7df90cf..93795dd5038 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
@@ -211,8 +211,15 @@
   <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\Compiler\FSharp.Compiler.Service.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
-    <ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="$(FSharpTestsRoot)\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
+    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
+  </ItemGroup>
+
 </Project>

From 648d3277c1dee8529a84e241f71dfe7581b6d65a Mon Sep 17 00:00:00 2001
From: Eugene Auduchinok <eugene.auduchinok@jetbrains.com>
Date: Fri, 9 Sep 2022 17:48:46 +0200
Subject: [PATCH 4/4] Fix relative path

---
 .../FSharp.Compiler.ComponentTests.fsproj                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
index 93795dd5038..c8241621066 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
@@ -215,7 +215,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
+    <ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">