5 files changed, 73 insertions, 41 deletions

diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 32f662217777..f4f3965a0df5 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fsharp
-PORTVERSION=	10.0.2
+PORTVERSION=	10.2.1
 CATEGORIES=	lang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/lang/fsharp/distinfo b/lang/fsharp/distinfo
index a538e74ede41..447e51bb2167 100644
--- a/lang/fsharp/distinfo
+++ b/lang/fsharp/distinfo
@@ -1,39 +1,61 @@
-TIMESTAMP = 1530287193
+TIMESTAMP = 1537386234
+SHA256 (benchmarkdotnet.diagnostics.windows.0.9.8.nupkg) = f2e703bba5bac7c105fa9ba23c12c92e577a3f9243eb2b75c8ed565fd54dc030
+SIZE (benchmarkdotnet.diagnostics.windows.0.9.8.nupkg) = 10760
+SHA256 (benchmarkdotnet.0.9.8.nupkg) = 090c97572fba1930a95714f3490a3f71518c07be6a52c60184f0d2c0a9081526
+SIZE (benchmarkdotnet.0.9.8.nupkg) = 214666
 SHA256 (fsharp.compiler.tools.4.1.27.nupkg) = de71f1fc7985036abc137e33220bd5c4159eea1750f3c273d10ea23d92fe7d25
 SIZE (fsharp.compiler.tools.4.1.27.nupkg) = 11484408
+SHA256 (fsharp.configuration.1.3.0.nupkg) = f249325a9f4a172f4ff3092a263f7546d5e89444e9b842786fdbba3b078d4a68
+SIZE (fsharp.configuration.1.3.0.nupkg) = 546083
 SHA256 (fsharp.core.3.0.2.nupkg) = 8257c6eb51ff3725592a0c98b2694a1d511900d887f0447c9417d961067c51ed
 SIZE (fsharp.core.3.0.2.nupkg) = 1891844
 SHA256 (fsharp.core.3.1.2.5.nupkg) = cc20a2e8784ba0ad5ce43056bc65e78ac85b1b580f3928b9130d71886291375c
 SIZE (fsharp.core.3.1.2.5.nupkg) = 4928202
 SHA256 (fsharp.core.4.0.0.1.nupkg) = f67929917b5d91f03019718ea5eec5aefcd38b7f15feb677c981a2df3a93d006
 SIZE (fsharp.core.4.0.0.1.nupkg) = 5323731
-SHA256 (fsharp.core.4.1.17.nupkg) = c8a7828e21491c638e6dd8af65ae4feb85fe3e7f2bad1075251a24e60f43061a
-SIZE (fsharp.core.4.1.17.nupkg) = 8780247
+SHA256 (fsharp.core.4.1.18.nupkg) = f868c0f49d843e786f87ea3930dcc286a3b98662c43323f180e140c2e2930a9a
+SIZE (fsharp.core.4.1.18.nupkg) = 10321312
 SHA256 (fsharp.data.2.2.5.nupkg) = 449cba49c2567b0b1f27d39c0aaaab73607893072809a81563598b06e63234b1
 SIZE (fsharp.data.2.2.5.nupkg) = 2542684
-SHA256 (fscheck.2.6.2.nupkg) = 743b3c58664595b4ef2a6efab02f29ad77b3e5330d0087c3f8c144c2f4f6093a
-SIZE (fscheck.2.6.2.nupkg) = 1581783
+SHA256 (fscheck.3.0.0-alpha3.nupkg) = ff0a80b315c3758d4d5329a1bedc47ecdada99f2ec310625cdcb314730f02d65
+SIZE (fscheck.3.0.0-alpha3.nupkg) = 709289
 SHA256 (fslexyacc.7.0.6.nupkg) = 5052d8eff11e0f08c375812f89c1cb4a2f4855e434935bbb93a3aab72bb8435b
 SIZE (fslexyacc.7.0.6.nupkg) = 728844
-SHA256 (microsoft.diasymreader.1.1.0.nupkg) = 083d032755638b6a31df4df90ccf7b4f59f477616512b16c687a766f8de7af11
-SIZE (microsoft.diasymreader.1.1.0.nupkg) = 78362
-SHA256 (microsoft.diasymreader.portablepdb.1.2.0.nupkg) = bfd182f3b326dd4e1bf1a5e151bb0591aab96646d1bb39a97ae97f0a1ed64861
-SIZE (microsoft.diasymreader.portablepdb.1.2.0.nupkg) = 152175
-SHA256 (microsoft.build.14.3.0.nupkg) = b0859445d955b62a1e3601f9315fa80437fcb6196855089dfc3a490cd6d55f9a
-SIZE (microsoft.build.14.3.0.nupkg) = 645770
+SHA256 (microbuild.core.0.2.0.nupkg) = fbbd636f7dc9b29763bfb3c7384f56083176766d7c22952384204287282040f9
+SIZE (microbuild.core.0.2.0.nupkg) = 4891
 SHA256 (microsoft.build.framework.14.3.0.nupkg) = b073ad40cae69893f1c75fc7e94ab3a474b3b3dc7e81a7ba4b20e2d18ee0e1a6
 SIZE (microsoft.build.framework.14.3.0.nupkg) = 71558
-SHA256 (microsoft.build.utilities.core.14.3.0.nupkg) = 919a6748daa0b82cfebe29cd6c95f808d6dd6684b4afd37255a3704022b16576
-SIZE (microsoft.build.utilities.core.14.3.0.nupkg) = 177716
+SHA256 (microsoft.build.framework.15.6.85.nupkg) = a8a84b2eb2596dd32a6a425131776fff4a0aaa5378dd80b38d04aaa5ae398673
+SIZE (microsoft.build.framework.15.6.85.nupkg) = 131458
 SHA256 (microsoft.build.tasks.core.14.3.0.nupkg) = ac6e6f690bc36a0bdfbbfb2b348ac05a7647004a71e09f612f76a7a25e823f06
 SIZE (microsoft.build.tasks.core.14.3.0.nupkg) = 484922
+SHA256 (microsoft.build.tasks.core.15.6.85.nupkg) = 8b0d4a488f39aad71c2a7c037326732804e2c8df92df7fac0a35fc9063b47c11
+SIZE (microsoft.build.tasks.core.15.6.85.nupkg) = 742226
+SHA256 (microsoft.build.utilities.core.14.3.0.nupkg) = 919a6748daa0b82cfebe29cd6c95f808d6dd6684b4afd37255a3704022b16576
+SIZE (microsoft.build.utilities.core.14.3.0.nupkg) = 177716
+SHA256 (microsoft.build.utilities.core.15.6.85.nupkg) = 69854943a0425bdd8586fab6539234a2c0072b245f41460cc8fb6310a1186c66
+SIZE (microsoft.build.utilities.core.15.6.85.nupkg) = 453529
+SHA256 (microsoft.build.14.3.0.nupkg) = b0859445d955b62a1e3601f9315fa80437fcb6196855089dfc3a490cd6d55f9a
+SIZE (microsoft.build.14.3.0.nupkg) = 645770
+SHA256 (microsoft.build.15.6.85.nupkg) = 7fc57e2985cbe4bb0e6b5d3643eae3ff7a566f540459578d0a0141d876a3fafb
+SIZE (microsoft.build.15.6.85.nupkg) = 2102286
+SHA256 (microsoft.portable.fsharp.core.10.1.0.nupkg) = 2d52c3df170a6bd2c3a8c1e6cb7379e6bf0658dc07f726bc6d32a55daf501d8e
+SIZE (microsoft.portable.fsharp.core.10.1.0.nupkg) = 99254639
+SHA256 (nunit.console.3.0.0.nupkg) = 725c2bdb0b63892d0fbc6650c44e1301174d5b773a0d6de59a9392128b571cf4
+SIZE (nunit.console.3.0.0.nupkg) = 347332
+SHA256 (nunit3testadapter.3.0.8-ctp-8.nupkg) = 3550b8657925c16ca867954a8dfa26a5b98e729fd9d8e95f33b76700992a86f7
+SIZE (nunit3testadapter.3.0.8-ctp-8.nupkg) = 195659
 SHA256 (nunit.3.5.0.nupkg) = df846860c416b24821e6d2a4554fecee86a3f10f362356547b9e94e358c2dda5
 SIZE (nunit.3.5.0.nupkg) = 1321223
-SHA256 (system.collections.immutable.1.3.1.nupkg) = 82210f4527d0d1f8de5c1ffa86c466130d0664540b96dd88e031e533cf652e91
-SIZE (system.collections.immutable.1.3.1.nupkg) = 371114
-SHA256 (system.reflection.metadata.1.4.2.nupkg) = f16413c3739d246d93790c8e93cf3edb1e80e1cdfcc1c9fc13e5f932da6bd0a5
-SIZE (system.reflection.metadata.1.4.2.nupkg) = 486695
-SHA256 (system.valuetuple.4.3.1.nupkg) = 9770fd40d3a635c377f8a5eb37f663b9d943c95743c22b5b9619a8d22d75a3d8
-SIZE (system.valuetuple.4.3.1.nupkg) = 79198
-SHA256 (fsharp-fsharp-10.0.2_GH0.tar.gz) = 1ae5e5e842df91f9f27aafa97109d74812219bc695384c5d8f1e8fbc5991d0ce
-SIZE (fsharp-fsharp-10.0.2_GH0.tar.gz) = 45328911
+SHA256 (nunitlite.3.5.0.nupkg) = a353c4da7d657d00b1a194e77c3692dfdec7b043f22b53a2c107f6841ad2a8a4
+SIZE (nunitlite.3.5.0.nupkg) = 222324
+SHA256 (system.collections.immutable.1.5.0.nupkg) = 38a5a45e00713d960ebca15c9ee95aacaf197ec2a9175b22325ad3d24178c0fa
+SIZE (system.collections.immutable.1.5.0.nupkg) = 791405
+SHA256 (system.io.compression.4.3.0.nupkg) = 8ee150a3423c608e6adc6397e2bd6012045cd8707e3ae3f4bbaab9aa081ab757
+SIZE (system.io.compression.4.3.0.nupkg) = 475610
+SHA256 (system.reflection.metadata.1.6.0.nupkg) = 9e0e088b1a7434c0919a19bd112133f8835d3b154ceee12408ed8f04aaee84cf
+SIZE (system.reflection.metadata.1.6.0.nupkg) = 839114
+SHA256 (system.valuetuple.4.4.0.nupkg) = 68c3ad8ff7deb843c13710fd115c8e8d64492f639fa434059e1440a311a04424
+SIZE (system.valuetuple.4.4.0.nupkg) = 212534
+SHA256 (fsharp-fsharp-10.2.1_GH0.tar.gz) = 4192652a162349ac6b4e053853d46cc7ba5469c0e552c78a1159dc9744a8f83b
+SIZE (fsharp-fsharp-10.2.1_GH0.tar.gz) = 47566511
diff --git a/lang/fsharp/files/patch-Makefile b/lang/fsharp/files/patch-Makefile
deleted file mode 100644
index 4350e316db92..000000000000
--- a/lang/fsharp/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2018-04-30 23:30:26 UTC
-+++ Makefile
-@@ -20,7 +20,6 @@ all:
- 	@echo monolibdir=$(monolibdir)
- 	@echo monobindir=$(monobindir)
- 	@echo -----------
--	$(MAKE) restore
- 	$(MAKE) build-proto
- 	$(MAKE) build
- 
diff --git a/lang/fsharp/nupkg-nuget b/lang/fsharp/nupkg-nuget
index bd3ade52ba8a..da5ace5bd013 100644
--- a/lang/fsharp/nupkg-nuget
+++ b/lang/fsharp/nupkg-nuget
@@ -1,18 +1,29 @@
+BenchmarkDotNet.Diagnostics.Windows=0.9.8
+BenchmarkDotNet=0.9.8
 FSharp.Compiler.Tools=4.1.27
+FSharp.Configuration=1.3.0
 FSharp.Core=3.0.2
 FSharp.Core=3.1.2.5
 FSharp.Core=4.0.0.1
-FSharp.Core=4.1.17
+FSharp.Core=4.1.18
 FSharp.Data=2.2.5
-FsCheck=2.6.2
+FsCheck=3.0.0-alpha3
 FsLexYacc=7.0.6
-Microsoft.DiaSymReader=1.1.0
-Microsoft.DiaSymReader.PortablePdb=1.2.0
-Microsoft.Build=14.3.0
+MicroBuild.Core=0.2.0
 Microsoft.Build.Framework=14.3.0
-Microsoft.Build.Utilities.Core=14.3.0
+Microsoft.Build.Framework=15.6.85
 Microsoft.Build.Tasks.Core=14.3.0
+Microsoft.Build.Tasks.Core=15.6.85
+Microsoft.Build.Utilities.Core=14.3.0
+Microsoft.Build.Utilities.Core=15.6.85
+Microsoft.Build=14.3.0
+Microsoft.Build=15.6.85
+Microsoft.Portable.FSharp.Core=10.1.0
+NUnit.Console=3.0.0
+NUnit3TestAdapter=3.0.8-ctp-8
 NUnit=3.5.0
-System.Collections.Immutable=1.3.1
-System.Reflection.Metadata=1.4.2
-System.ValueTuple=4.3.1
+NUnitLite=3.5.0
+System.Collections.Immutable=1.5.0
+System.IO.Compression=4.3.0
+System.Reflection.Metadata=1.6.0
+System.ValueTuple=4.4.0
diff --git a/lang/fsharp/pkg-plist b/lang/fsharp/pkg-plist
index d7c7518db1fc..f0f2cf7fc08f 100644
--- a/lang/fsharp/pkg-plist
+++ b/lang/fsharp/pkg-plist
@@ -55,6 +55,10 @@ lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.dll
 lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.optdata
 lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.sigdata
 lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.5.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.5.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.5.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.5.0/FSharp.Core.xml
 lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.dll
 lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.optdata
 lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.sigdata
@@ -67,21 +71,26 @@ lib/mono/fsharp/fsiAnyCpu.exe
 lib/mono/fsharp/fsiAnyCpu.exe.config
 lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.NetSdk.props
 lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.NetSdk.targets
+lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Overrides.NetSdk.targets
 lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.Portable.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.NetSdk.props
 lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.NetSdk.targets
+lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.Overrides.NetSdk.targets
 lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.Portable.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.NetSdk.props
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.NetSdk.targets
+lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.Overrides.NetSdk.targets
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.Portable.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.FSharp.NetSdk.props
 lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.FSharp.NetSdk.targets
+lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.FSharp.Overrides.NetSdk.targets
 lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.Portable.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.NetSdk.props
 lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.NetSdk.targets
+lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.Overrides.NetSdk.targets
 lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.Portable.FSharp.Targets