Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Enable roll forward in our .NET Core exes
This changes our build to mark all of our .NET Core applications as
rolling forward on major / minor versions of the .NET framework.
Presently our tools ship inside both .NET Core 2 and 3 SDKs. This
setting allows our tools to run unmodified in both settings.
  • Loading branch information
brettfo committed May 17, 2019
commit 4d0ed2111b9ddf864fa07753854d047c5382504e
1 change: 1 addition & 0 deletions DEVGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
Install

- [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472)
- [.NET Core 3 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0)

**NOTE on Windows:**

Expand Down
1 change: 1 addition & 0 deletions FSharpBuild.Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\targets\Imports.targets" />
<Import Project="eng\targets\NuGet.targets" />
<Import Project="eng\targets\NGenBinaries.targets" />
<Import Project="FSharp.Profiles.props" />
Expand Down
5 changes: 5 additions & 0 deletions eng/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,11 @@ try {

if ($ci) {
Prepare-TempDir

# enable us to build netcoreapp2.1 binaries
$global:_DotNetInstallDir = Join-Path $RepoRoot ".dotnet"
InstallDotNetSdk $global:_DotNetInstallDir $GlobalJson.tools.dotnet
InstallDotNetSdk $global:_DotNetInstallDir "2.1.503"
}

if ($bootstrap) {
Expand Down
3 changes: 3 additions & 0 deletions eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ function BuildSolution {

InitializeDotNetCli $restore

# enable us to build netcoreapp2.1 binaries
InstallDotNetSdk $_InitializeDotNetCli 2.1.503

BuildSolution

if [[ "$test_core_clr" == true ]]; then
Expand Down
3 changes: 3 additions & 0 deletions eng/config/runtimeconfig.template.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"rollForwardOnNoCandidateFx": 2
}
9 changes: 9 additions & 0 deletions eng/targets/Imports.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<PropertyGroup>
<!--
When building a .NET Core exe make sure to include the template runtimeconfig.json file
which has all of our global settings
-->
<UserRuntimeConfig Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(OutputType)' == 'Exe'">$(RepositoryEngineeringDir)config\runtimeconfig.template.json</UserRuntimeConfig>
</PropertyGroup>
</Project>