Merge pull request #5589 from marek-safar/tests
[mono.git] / packaging / MacSDK / patches / fsharp-install-netsdk-targets.patch
1 From 066a39a0ccd98222a0e372a443e59e28182def50 Mon Sep 17 00:00:00 2001
2 From: nosami <jasonimison@gmail.com>
3 Date: Thu, 14 Sep 2017 18:54:49 +0100
4 Subject: [PATCH] Install Microsoft.FSharp.NetSdk.props and targets into Mono
5
6 So that F# .NET Core 2.0 templates can be built with VS for Mac and
7 Mono msbuild. Re: https://bugzilla.xamarin.com/show_bug.cgi?id=57771
8
9 Searching the .NET Core sdk files we see:
10
11 /Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.FSharp.props:
12
13 ```
14 <FSharpPropsShim Condition = " '$(FSharpPropsShim)' == '' and Exists('$(MSBuildToolsPath)\FSharp\Microsoft.FSharp.NetSdk.props') ">$(MSBuildToolsPath)\FSharp\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
15
16 <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>
17
18 <Import Condition=" '$(UseBundledFSharpTargets)' == 'true' and
19   Exists('$(FSharpPropsShim)') " Project="$(FSharpPropsShim)" />
20 ```
21 ---
22  mono/config.make.in | 12 ++++++++++++
23  1 file changed, 12 insertions(+)
24
25 diff --git a/mono/config.make.in b/mono/config.make.in
26 index 6249aca46..573717208 100644
27 --- a/mono/config.make.in
28 +++ b/mono/config.make.in
29 @@ -194,6 +194,18 @@ install-sdk-lib:
30             $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
31             $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \
32             $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \
33 +           \
34 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \
35 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \
36 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
37 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \
38 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \
39 +           \
40 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \
41 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \
42 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
43 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \
44 +           $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \
45         fi
46         @if test x-$(outsuffix) = x-net40; then \
47             if test -e $(outdir)$(NAME).dll; then \