Skip to content

Commit 089f2e6

Browse files
committed
Fix patch.
1 parent 7896443 commit 089f2e6

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Tue, 12 Jul 2022 14:30:03 -0500
4-
Subject: [PATCH] Use the live FSharp.Core bits to bootstrap - source-build
4+
Subject: [PATCH 2/2] Use the live FSharp.Core bits to bootstrap - source-build
55
doesn't need to match the shipped bootstrap version. See
66
https://github.com/dotnet/fsharp/issues/13463 for more details.
77

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

12-
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
13-
index 7a86fc24b..3026d0511 100644
14-
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
15-
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
16-
@@ -53,7 +53,7 @@
12+
diff --git a/src/FSharp.Build/FSharp.Build.fsproj b/src/FSharp.Build/FSharp.Build.fsproj
13+
index 56abe4a..a79179f 100644
14+
--- a/src/FSharp.Build/FSharp.Build.fsproj
15+
+++ b/src/FSharp.Build/FSharp.Build.fsproj
16+
@@ -52,7 +52,7 @@
1717
<None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
1818
</ItemGroup>
19-
19+
2020
- <ItemGroup Condition="'$(Configuration)' == 'Proto'">
2121
+ <ItemGroup Condition="'$(Configuration)' == 'Proto' and '$(DotNetBuildFromSource)' != 'true'">
2222
<!--
23-
The FSharp.Build built here may be loaded directly into a shipped Visual Studio, to that end, we cannot
23+
The FSharp.Build built here may be loaded directly into a shipped Visual Studio, to that end, we cannot
2424
rely on new API's just being added to FSharp.Core.
25-
@@ -61,7 +61,7 @@
26-
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)"/>
25+
@@ -60,7 +60,7 @@
26+
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" IncludeAssets="compile" ExcludeAssets="all" PrivateAssets="all" />
2727
</ItemGroup>
28-
28+
2929
- <ItemGroup Condition="'$(Configuration)' != 'Proto'">
3030
+ <ItemGroup Condition="'$(Configuration)' != 'Proto' or '$(DotNetBuildFromSource)' == 'true'">
3131
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
3232
</ItemGroup>
33-
34-
33+

0 commit comments

Comments
 (0)