75 lines
3.6 KiB
Diff
75 lines
3.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: MichaelSimons <msimons@microsoft.com>
|
||
|
|
Date: Mon, 23 May 2022 19:09:18 +0000
|
||
|
|
Subject: [PATCH] Add Microsoft.FSharp.Compiler to source-build
|
||
|
|
|
||
|
|
Backport issue: Tracking issue: https://github.com/dotnet/fsharp/issues/13174
|
||
|
|
---
|
||
|
|
eng/SourceBuild.props | 17 +----------------
|
||
|
|
.../Microsoft.FSharp.Compiler.csproj | 16 ++++++++++++++++
|
||
|
|
2 files changed, 17 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||
|
|
index 903ee00d3..b8402e043 100644
|
||
|
|
--- a/eng/SourceBuild.props
|
||
|
|
+++ b/eng/SourceBuild.props
|
||
|
|
@@ -5,28 +5,13 @@
|
||
|
|
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
|
||
|
|
</PropertyGroup>
|
||
|
|
|
||
|
|
- <Target Name="ApplySourceBuildPatchFiles"
|
||
|
|
- Condition="
|
||
|
|
- '$(ArcadeBuildFromSource)' == 'true' and
|
||
|
|
- '$(ArcadeInnerBuildFromSource)' == 'true'"
|
||
|
|
- BeforeTargets="Execute">
|
||
|
|
- <ItemGroup>
|
||
|
|
- <SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
|
||
|
|
- </ItemGroup>
|
||
|
|
-
|
||
|
|
- <Exec
|
||
|
|
- Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
||
|
|
- WorkingDirectory="$(RepoRoot)"
|
||
|
|
- Condition="'@(SourceBuildPatchFile)' != ''" />
|
||
|
|
- </Target>
|
||
|
|
-
|
||
|
|
<!--
|
||
|
|
The build script passes in the full path of the sln to build. This must be overridden in order to build
|
||
|
|
the cloned source in the inner build.
|
||
|
|
-->
|
||
|
|
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
|
||
|
|
<PropertyGroup>
|
||
|
|
- <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln"</InnerBuildArgs>
|
||
|
|
+ <InnerBuildArgs>$(InnerBuildArgs) '/p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln;$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"'</InnerBuildArgs>
|
||
|
|
</PropertyGroup>
|
||
|
|
</Target>
|
||
|
|
|
||
|
|
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||
|
|
index eaeac80f3..417beac4e 100644
|
||
|
|
--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||
|
|
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||
|
|
@@ -9,8 +9,24 @@
|
||
|
|
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
|
||
|
|
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
|
||
|
|
<NoDefaultExcludes>true</NoDefaultExcludes>
|
||
|
|
+ <ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
|
||
|
|
</PropertyGroup>
|
||
|
|
|
||
|
|
+ <ItemGroup>
|
||
|
|
+ <ProjectReference Include="..\fsc\fsc.fsproj">
|
||
|
|
+ <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
|
||
|
|
+ </ProjectReference>
|
||
|
|
+ <ProjectReference Include="..\fsi\fsi.fsproj">
|
||
|
|
+ <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
|
||
|
|
+ </ProjectReference>
|
||
|
|
+ <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" Targets="Restore;Build;Pack">
|
||
|
|
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||
|
|
+ </ProjectReference>
|
||
|
|
+ <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Targets="Restore;Build;Pack">
|
||
|
|
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||
|
|
+ </ProjectReference>
|
||
|
|
+ </ItemGroup>
|
||
|
|
+
|
||
|
|
<ItemGroup>
|
||
|
|
<NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
|
||
|
|
<NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />
|