Skip to content

Add F# patch to use live FSharp.Build package. #14183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crummel wants to merge 2 commits into from
Closed

Add F# patch to use live FSharp.Build package. #14183

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7896443
Add F# patch to use live FSharp.Build package.
crummel Jul 20, 2022
089f2e6
Fix patch.
crummel Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix patch.
  • Loading branch information
@crummel
crummel committed Jul 21, 2022
commit 089f2e6cdbbc6977ababcfed1bd7a269cd028179
27 changes: 13 additions & 14 deletions ...rp.Core-bits-to-bootstrap-source-bu.patch → ...rp.Core-bits-to-bootstrap-source-bu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Tue, 12 Jul 2022 14:30:03 -0500
Subject: [PATCH] Use the live FSharp.Core bits to bootstrap - source-build
Subject: [PATCH 2/2] Use the live FSharp.Core bits to bootstrap - source-build
doesn't need to match the shipped bootstrap version. See
https://github.com/dotnet/fsharp/issues/13463 for more details.

---
src/fsharp/FSharp.Build/FSharp.Build.fsproj | 4 ++--
src/FSharp.Build/FSharp.Build.fsproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
index 7a86fc24b..3026d0511 100644
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -53,7 +53,7 @@
diff --git a/src/FSharp.Build/FSharp.Build.fsproj b/src/FSharp.Build/FSharp.Build.fsproj
index 56abe4a..a79179f 100644
--- a/src/FSharp.Build/FSharp.Build.fsproj
+++ b/src/FSharp.Build/FSharp.Build.fsproj
@@ -52,7 +52,7 @@
<None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

- <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+ <ItemGroup Condition="'$(Configuration)' == 'Proto' and '$(DotNetBuildFromSource)' != 'true'">
<!--
The FSharp.Build built here may be loaded directly into a shipped Visual Studio, to that end, we cannot
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.
@@ -61,7 +61,7 @@
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)"/>
@@ -60,7 +60,7 @@
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" IncludeAssets="compile" ExcludeAssets="all" PrivateAssets="all" />
</ItemGroup>

- <ItemGroup Condition="'$(Configuration)' != 'Proto'">
+ <ItemGroup Condition="'$(Configuration)' != 'Proto' or '$(DotNetBuildFromSource)' == 'true'">
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>