|
1 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2 | 2 | From: Chris Rummel < [email protected]>
|
3 | 3 | 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 |
5 | 5 | doesn't need to match the shipped bootstrap version. See
|
6 | 6 | https://github.com/dotnet/fsharp/issues/13463 for more details.
|
7 | 7 |
|
8 | 8 | ---
|
9 |
| - src/fsharp/FSharp.Build/FSharp.Build.fsproj | 4 ++-- |
| 9 | + src/FSharp.Build/FSharp.Build.fsproj | 4 ++-- |
10 | 10 | 1 file changed, 2 insertions(+), 2 deletions(-)
|
11 | 11 |
|
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 @@ |
17 | 17 | <None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
|
18 | 18 | </ItemGroup>
|
19 |
| - |
| 19 | + |
20 | 20 | - <ItemGroup Condition="'$(Configuration)' == 'Proto'">
|
21 | 21 | + <ItemGroup Condition="'$(Configuration)' == 'Proto' and '$(DotNetBuildFromSource)' != 'true'">
|
22 | 22 | <!--
|
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 |
24 | 24 | 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" /> |
27 | 27 | </ItemGroup>
|
28 |
| - |
| 28 | + |
29 | 29 | - <ItemGroup Condition="'$(Configuration)' != 'Proto'">
|
30 | 30 | + <ItemGroup Condition="'$(Configuration)' != 'Proto' or '$(DotNetBuildFromSource)' == 'true'">
|
31 | 31 | <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
|
32 | 32 | </ItemGroup>
|
33 |
| - |
34 |
| - |
| 33 | + |
0 commit comments