diff options
| author | nosami <jasonimison@gmail.com> | 2017-09-14 21:08:06 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-09-15 16:56:17 +0300 |
| commit | 7d7887780057e40f3921ceedca6c1579a928655d (patch) | |
| tree | e8b99b0c8e1d18f33ad0bc84e0bb767322d09f1f | |
| parent | 87a052504b1d703cb3a123871c9b65900ce6862a (diff) | |
Install Microsoft.FSharp.NetSdk.props and targetsmono-5.4.0.199
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=57771
| -rw-r--r-- | packaging/MacSDK/fsharp.py | 2 | ||||
| -rw-r--r-- | packaging/MacSDK/patches/fsharp-install-netsdk-targets.patch | 47 |
2 files changed, 48 insertions, 1 deletions
diff --git a/packaging/MacSDK/fsharp.py b/packaging/MacSDK/fsharp.py index f2e7a9bcdb6..4de097b5dc7 100644 --- a/packaging/MacSDK/fsharp.py +++ b/packaging/MacSDK/fsharp.py @@ -8,7 +8,7 @@ class FsharpPackage(GitHubTarballPackage): override_properties={ 'make': 'make' }) self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets'] - self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-metadata-table-size-fix.patch']) + self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-metadata-table-size-fix.patch', 'patches/fsharp-install-netsdk-targets.patch']) def prep(self): Package.prep(self) diff --git a/packaging/MacSDK/patches/fsharp-install-netsdk-targets.patch b/packaging/MacSDK/patches/fsharp-install-netsdk-targets.patch new file mode 100644 index 00000000000..796a0077584 --- /dev/null +++ b/packaging/MacSDK/patches/fsharp-install-netsdk-targets.patch @@ -0,0 +1,47 @@ +From 066a39a0ccd98222a0e372a443e59e28182def50 Mon Sep 17 00:00:00 2001 +From: nosami <jasonimison@gmail.com> +Date: Thu, 14 Sep 2017 18:54:49 +0100 +Subject: [PATCH] Install Microsoft.FSharp.NetSdk.props and targets into Mono + +So that F# .NET Core 2.0 templates can be built with VS for Mac and +Mono msbuild. Re: https://bugzilla.xamarin.com/show_bug.cgi?id=57771 + +Searching the .NET Core sdk files we see: + +/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.FSharp.props: + +``` +<FSharpPropsShim Condition = " '$(FSharpPropsShim)' == '' and Exists('$(MSBuildToolsPath)\FSharp\Microsoft.FSharp.NetSdk.props') ">$(MSBuildToolsPath)\FSharp\Microsoft.FSharp.NetSdk.props</FSharpPropsShim> + +<FSharpPropsShim Condition = " '$(FSharpPropsShim)' == '' and Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.NetSdk.props') ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.NetSdk.props</FSharpPropsShim> + +<Import Condition=" '$(UseBundledFSharpTargets)' == 'true' and + Exists('$(FSharpPropsShim)') " Project="$(FSharpPropsShim)" /> +``` +--- + mono/config.make.in | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/mono/config.make.in b/mono/config.make.in +index 6249aca46..573717208 100644 +--- a/mono/config.make.in ++++ b/mono/config.make.in +@@ -194,6 +194,18 @@ install-sdk-lib: + $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \ + $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \ + $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \ ++ \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \ ++ \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \ + fi + @if test x-$(outsuffix) = x-net40; then \ + if test -e $(outdir)$(NAME).dll; then \ |