Skip to content

Makefile updates to get dotnet/fsharp building on mono #1

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

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Makefile updates to get dotnet/fsharp building on mono #1

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7453406
bring over mono directory updates from fsharp/fsharp
baronfel May 17, 2019
54364b8
update makefile to use msbuild and flags instead of sdk and cli param…
baronfel May 17, 2019
541ba7c
try to get system.collection reference honored by FSharp.Build.fsproj
baronfel May 17, 2019
c4f93b0
proto/restore/build all work on mono 5.20 now
baronfel May 18, 2019
d906c81
replicate msbuild targets for --no-build and -l
baronfel May 18, 2019
129e9dc
Add dockerfile for replicable environment while iterating
baronfel May 18, 2019
4838d8f
start including sections from the mono build for location defintions
baronfel May 18, 2019
ebc63f3
Apply patch from mono packaging repository: https://github.com/mono/m…
baronfel May 18, 2019
033a425
applying patch https://github.com/mono/mono/blob/master/packaging/Mac…
baronfel May 18, 2019
a55d861
add in previous copies and start iterating on making paths correct
baronfel May 18, 2019
f37ef5e
Add new TFM for net45 since fsharp.core builds that as a baseline now
baronfel May 18, 2019
6f1bde0
run tests via nunit directly on mono
baronfel May 19, 2019
a656980
get makefile working for everything except old targetframeworkprofiles
baronfel May 22, 2019
9c3c48d
Fix casing
baronfel May 22, 2019
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
2 changes: 1 addition & 1 deletion FSharpBuild.Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net462'">$(MonoLibFolder)/4.6.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net47'">$(MonoLibFolder)/4.7-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net471'">$(MonoLibFolder)/4.7.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net472'">$(MonoLibFolder)/4.7.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net472'">$(MonoLibFolder)/4.7.2-api;$(MonoLibFolder)/4.7.2-api/Facades</FrameworkPathOverride>
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be reverted I believe. the stable msbuild targets for mono handle setting facades from what I can see now, and this property just ends up being reverted if you look at a detailed log.

</PropertyGroup>

<!-- signing -->
Expand Down
79 changes: 44 additions & 35 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,55 @@
Configuration ?= release
DotNetVersion = `cat DotnetCLIToolsVersion.txt`
DotNetToolPath = $(CURDIR)/artifacts/toolset/dotnet
DotNetExe = "$(DotNetToolPath)/dotnet"
Configuration ?= Release
ConfigurationProperty = /p:Configuration=$(Configuration)

all: proto restore build test
Verbosity ?= normal
VerbosityProperty = /Verbosity:$(Verbosity)

MSBuild = /Library/Frameworks/Mono.framework/Versions/Current/Commands/msbuild
RestoreCommand = $(MSBuild) /t:Restore
BuildCommand = $(MSBuild) /t:Build
TestCommand = $(MSBuild) /t:VSTest
ProtoConfiguration = /p:Configuration=Proto

tools:
$(CURDIR)/scripts/dotnet-install.sh --version $(DotNetVersion) --install-dir "$(DotNetToolPath)"
NF45 = /p:TargetFramework=net45
NF472 = /p:TargetFramework=net472
NS16 = /p:TargetFramework=netstandard1.6
NS20 = /p:TargetFramework=netstandard2.0
NCA20 = /p:TargetFramework=netcoreapp2.0
NCA21 = /p:TargetFramework=netcoreapp2.1

all: proto restore build test

proto: tools
$(DotNetExe) build-server shutdown
$(DotNetExe) restore src/buildtools/buildtools.proj
$(DotNetExe) restore src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(DotNetExe) restore src/fsharp/fsc/fsc.fsproj
$(DotNetExe) build src/buildtools/buildtools.proj -c Proto
$(DotNetExe) build src/fsharp/FSharp.Build/FSharp.Build.fsproj -f netstandard2.0 -c Proto
$(DotNetExe) build src/fsharp/fsc/fsc.fsproj -f netcoreapp2.1 -c Proto
proto:
$(RestoreCommand) $(NF472) src/buildtools/buildtools.proj
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

virtually all changes to this file revolve around using pure msbuild equivalents to previous dotnet sdk commands.

$(RestoreCommand) $(NF472) src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(RestoreCommand) $(NF472) src/fsharp/fsc/fsc.fsproj
$(BuildCommand) $(NF472) $(ConfigurationProperty) src/buildtools/buildtools.proj
$(BuildCommand) $(NF472) $(ProtoConfiguration) src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(BuildCommand) $(NF472) $(ProtoConfiguration) $(VerbosityProperty) src/fsharp/fsc/fsc.fsproj

restore:
$(DotNetExe) restore src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(DotNetExe) restore src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(DotNetExe) restore src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(DotNetExe) restore src/fsharp/fsc/fsc.fsproj
$(DotNetExe) restore src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(DotNetExe) restore src/fsharp/fsi/fsi.fsproj
$(DotNetExe) restore tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
$(DotNetExe) restore tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
$(RestoreCommand) src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(RestoreCommand) src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(RestoreCommand) src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(RestoreCommand) src/fsharp/fsc/fsc.fsproj
$(RestoreCommand) src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(RestoreCommand) src/fsharp/fsi/fsi.fsproj
$(RestoreCommand) tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
$(RestoreCommand) tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj

build: proto restore
$(DotNetExe) build-server shutdown
$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsc/fsc.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsi/fsi.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF45) src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) src/fsharp/fsc/fsc.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) src/fsharp/fsi/fsi.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
$(BuildCommand) $(ConfigurationProperty) $(NF472) tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj

test: build
$(DotNetExe) test -f netcoreapp2.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx"
$(DotNetExe) test -f netcoreapp2.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx"
$(TestCommand) $(NF472) $(ConfigurationProperty) tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj /p:VSTestNoBuild=true /p:VSTestLogger="trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx"
$(TestCommand) $(NF472) $(ConfigurationProperty) tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj /p:VSTestNoBuild=true /p:VSTestLogger="trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx"

clean:
rm -rf $(CURDIR)/artifacts
rm -rf $(CURDIR)/Artifacts
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<!-- version numbers from files -->
<RoslynVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim())</RoslynVersion>
<!-- System.* packages -->
<SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

initially I thought that adding a version here and flowing through a packagereference would be what we needed to get some projects to build on net472 for mono, but in the end plain References where what we needed.

<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
<SystemConsoleVersion>4.3.0</SystemConsoleVersion>
<SystemDesignVersion>4.0.0</SystemDesignVersion>
Expand Down
2 changes: 1 addition & 1 deletion mono/appveyor.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# the version under development, update after a release
$version = '4.1.31'
$version = '10.1.2'

function isVersionTag($tag){
$v = New-Object Version
Expand Down
2 changes: 1 addition & 1 deletion mono/cibuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# note: expects to run from top directory
#./mono/latest-mono-stable.sh
./mono/latest-mono-stable.sh
make Configuration=$@
#sudo make install Configuration=$@
#./mono/test-mono.sh
14 changes: 13 additions & 1 deletion mono/config.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DISTVERSION = 201011
ifeq (x-$(TargetDotnetProfile)-,x-net40-)

ifeq (x-$(FSharpCoreBackVersion)-,x--)
VERSION = 4.4.1.0
VERSION = 4.4.5.0
PKGINSTALL = yes
REFASSEMPATH = .NETFramework/v4.0
outsuffix = $(TargetDotnetProfile)
Expand All @@ -55,6 +55,18 @@ REFASSEMPATH = .NETFramework/v4.0
outsuffix = fsharp40/$(TargetDotnetProfile)
endif

ifeq (x-$(FSharpCoreBackVersion)-,x-4.1-)
VERSION = 4.4.1.0
REFASSEMPATH = .NETFramework/v4.0
outsuffix = fsharp41/$(TargetDotnetProfile)
endif

ifeq (x-$(FSharpCoreBackVersion)-,x-4.3-)
VERSION = 4.4.3.0
REFASSEMPATH = .NETFramework/v4.0
outsuffix = fsharp43/$(TargetDotnetProfile)
endif

endif

ifeq (x-$(TargetDotnetProfile)-,x-monoandroid10+monotouch10+xamarinios10-)
Expand Down
Binary file added mono/dependencies/2.1/MonoTouch/System.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/MonoTouch/System.Numerics.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/MonoTouch/System.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/MonoTouch/mscorlib.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinTVOS/System.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinTVOS/System.Numerics.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinTVOS/System.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinTVOS/mscorlib.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinWatchOS/System.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinWatchOS/System.Numerics.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinWatchOS/System.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/2.1/XamarinWatchOS/mscorlib.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/4.5/XamarinMac/System.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/4.5/XamarinMac/System.Numerics.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/4.5/XamarinMac/System.dll
View file
Open in desktop
Binary file not shown.
Binary file added mono/dependencies/4.5/XamarinMac/mscorlib.dll
View file
Open in desktop
Binary file not shown.
12 changes: 8 additions & 4 deletions src/buildtools/buildtools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
BeforeTargets="CoreCompile">

<PropertyGroup>
<FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\Bootstrap\fslex.dll</FsLexPath>
<FsLexPath Condition="'$(FsLexPath)' == '' And '$(MonoPackaging)' == 'false' ">$(ArtifactsDir)\Bootstrap\netcoreapp2.1\fslex.dll</FsLexPath>
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes to this file are around making fxlex/fsyacc invoke correctly on mono/unix. Directories have changed too and need to be validated (ie building by the makefile we don't get the Bootstrap subdirectory. if this is desired we should solve the artifactsdir problem then adjust these paths.

<FsLexPath Condition="'$(FsLexPath)' == '' And '$(MonoPackaging)' == 'true' ">$(ArtifactsDir)\bin\fslex\Release\net472\fslex.exe</FsLexPath>
</PropertyGroup>

<!-- Create the output directory -->
<MakeDir Directories="$(FsLexOutputFolder)"/>

<!-- Run the tool -->
<Exec Command="&quot;$(DotNetTool)&quot; &quot;$(FsLexPath)&quot; -o &quot;$(FsLexOutputFolder)%(FsLex.Filename).fs&quot; %(FsLex.OtherFlags) %(FsLex.Identity)" />
<Exec Condition="'$(MonoPackaging)' == 'false'" Command="&quot;$(DotNetTool)&quot; &quot;$(FsLexPath)&quot; -o &quot;$(FsLexOutputFolder)%(FsLex.Filename).fs&quot; %(FsLex.OtherFlags) %(FsLex.Identity)" />
<Exec Condition="'$(MonoPackaging)' == 'true'" Command="&quot;mono&quot; &quot;$(FsLexPath)&quot; -o &quot;$(FsLexOutputFolder)%(FsLex.Filename).fs&quot; %(FsLex.OtherFlags) %(FsLex.Identity)" />

<!-- Make sure it will get cleaned -->
<CreateItem Include="$(FsLexOutputFolder)%(FsLex.Filename).fs">
Expand All @@ -43,14 +45,16 @@
BeforeTargets="CoreCompile">

<PropertyGroup>
<FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\Bootstrap\fsyacc.dll</FsYaccPath>
<FsYaccPath Condition="'$(FsYaccPath)' == '' And '$(MonoPackaging)' == 'false'">$(ArtifactsDir)\Bootstrap\netcoreapp2.1\fsyacc.dll</FsYaccPath>
<FsYaccPath Condition="'$(FsYaccPath)' == '' And '$(MonoPackaging)' == 'true'">$(ArtifactsDir)\bin\fsyacc\Release\net472\fsyacc.exe</FsYaccPath>
</PropertyGroup>

<!-- Create the output directory -->
<MakeDir Directories="$(FsYaccOutputFolder)" />

<!-- Run the tool -->
<Exec Command="&quot;$(DotNetTool)&quot; &quot;$(FsYaccPath)&quot; -o &quot;$(FsYaccOutputFolder)%(FsYacc.Filename).fs&quot; %(FsYacc.OtherFlags) %(FsYacc.Identity)" />
<Exec Condition="'$(MonoPackaging)' == 'false'" Command="&quot;$(DotNetTool)&quot; &quot;$(FsYaccPath)&quot; -o &quot;$(FsYaccOutputFolder)%(FsYacc.Filename).fs&quot; %(FsYacc.OtherFlags) %(FsYacc.Identity)" />
<Exec Condition="'$(MonoPackaging)' == 'true'" Command="&quot;mono&quot; &quot;$(FsYaccPath)&quot; -o &quot;$(FsYaccOutputFolder)%(FsYacc.Filename).fs&quot; %(FsYacc.OtherFlags) %(FsYacc.Identity)" />

<!-- Make sure it will get cleaned -->
<CreateItem Include="$(FsYaccOutputFolder)%(FsYacc.Filename).fs">
Expand Down
2 changes: 1 addition & 1 deletion src/buildtools/fslex/fslex.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to be able to invoke these tools on mono, so they build for net472 now.

<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/buildtools/fsyacc/fsyacc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed for several projects in order to enable mono builds

<AssemblyName>FSharp.Build</AssemblyName>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
Expand Down Expand Up @@ -38,6 +37,7 @@

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Microsoft.VisualFSharp.Type.Providers.Redist" Version="$(MicrosoftVisualFSharpTypeProvidersRedistVersion)" />
<Reference Include="System.Collections" />
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be strongly-versioned? (same question for the other instances)

</ItemGroup>

<ItemGroup>
Expand All @@ -46,6 +46,7 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Include="System.Collections" Version="4.3.0" />
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initially I wanted to use a packagereference for System.Collections like other assemblies do, but this didn't work for two reasons: I couldn't use the version from Versions.props (it never got picked up?) and the packagereference didn't delegate and add the appropriate gac reference.

</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard2.0</TargetFrameworks>
<AssemblyName>FSharp.Compiler.Interactive.Settings</AssemblyName>
<NoWarn>$(NoWarn);45;55;62;75;1182;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
Expand Down
6 changes: 5 additions & 1 deletion src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard2.0</TargetFrameworks>
<AssemblyName>FSharp.Compiler.Private</AssemblyName>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
Expand Down Expand Up @@ -696,6 +695,11 @@

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="System.Collections" />
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same story here for these Reference nodes. Should they be strongly-referenced and/or is there a package equivalent?

<Reference Include="System.Globalization" />
<Reference Include="System.Threading" />
<Reference Include="System.Threading.Tasks" />
<Reference Include="netstandard" />
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
Expand Down
7 changes: 6 additions & 1 deletion src/fsharp/FSharp.Core/FSharp.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
<DefineConstants>$(DefineConstants);FSHARP_CORE</DefineConstants>
<DefineConstants Condition="'$(Configuration)' == 'Proto'">BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">BUILD_FROM_SOURCE;$(DefineConstants)</DefineConstants>
Copy link
Owner Author

@baronfel baronfel May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is BUILD_FROM_SOURCE specified with the official builds? I couldn't replicate it with a command line flag and without this we get errors in prim-types.fsi where the inref/byref types are defined and used.

<OtherFlags>$(OtherFlags) --warnon:1182 --compiling-fslib --compiling-fslib-40 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
<NGenBinary>true</NGenBinary>
Expand Down Expand Up @@ -218,6 +218,7 @@
</ItemGroup>

<ItemGroup>

<PackageReference Include="System.Linq.Queryable" Version="$(SystemLinqQueryableVersion)" />
<PackageReference Include="System.Net.Requests" Version="$(SystemNetRequestsVersion)" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
Expand All @@ -228,6 +229,10 @@
<PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<PackageReference Include="System.Collections" Version="4.3.0" />
</ItemGroup>

<!-- Hook compilation phase to do custom work -->
<!-- NOTE: The optdata and sigdata files are no longer needed by the F# compiler (the information is -->
<!-- integrated as resources into more recent FSharp.Core.dll's. However they are still produced to -->
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/fsc/fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
<TargetExt>.exe</TargetExt>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/fsi/fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
<TargetExt>.exe</TargetExt>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
Expand Down
1 change: 0 additions & 1 deletion tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
<OutputType>Library</OutputType>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UnitTestType>nunit</UnitTestType>
Expand Down
1 change: 0 additions & 1 deletion tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
<OutputType>Library</OutputType>

<AssemblyName>FSharp.Core.UnitTests</AssemblyName>
Expand Down