Fix main build error (dotnet#12378)

* Fix build error * Update version number to match shipped package
ncave · Nov 12, 2021 · dc81e22 · dc81e22
1 parent 760a381
commit dc81e22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -39,7 +39,7 @@
     <FSharpCompilerServiceReleaseNotesVersion>$(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion)</FSharpCompilerServiceReleaseNotesVersion>
     <!-- -->
     <!-- The current published nuget package -->
-    <FSharpCoreShippedPackageVersionValue>6.0.0</FSharpCoreShippedPackageVersionValue>
+    <FSharpCoreShippedPackageVersionValue>6.0.1</FSharpCoreShippedPackageVersionValue>
     <!-- -->
     <!-- The pattern for specifying the preview package -->
     <FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>

diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -44,7 +44,15 @@
     <None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+    <!--
+        The FSharp.Build built here may be loaded directly into a shipped Visual Studio, to that end, we cannot 
+        rely on new API's just being added to FSharp.Core.
+    -->
+    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)"/>
+  </ItemGroup>
+
+  <ItemGroup  Condition="'$(Configuration)' != 'Proto'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>