1 From b02965711a387b015a6af4b9d26bbdabf10fc5b4 Mon Sep 17 00:00:00 2001
2 From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
3 Date: Mon, 1 Aug 2016 13:47:41 -0400
4 Subject: [PATCH 1/2] Remove xbuild workarounds
6 They do not work Mono 4.6+ where the underlying bug is fixed
8 src/FSharpSource.targets | 8 --------
9 1 file changed, 8 deletions(-)
11 diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
12 index eb57269..ea3656f 100755
13 --- a/src/FSharpSource.targets
14 +++ b/src/FSharpSource.targets
15 @@ -306,8 +306,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
16 <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
17 <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
19 - <!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
20 - <AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.0\mscorlib.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.0</AssemblySearchPaths>
23 <!-- Target Portable -->
24 @@ -348,8 +346,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
25 <TargetProfile>netcore</TargetProfile>
26 <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
27 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
28 - <!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
29 - <AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
30 <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
33 @@ -389,8 +385,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
34 <TargetProfile>netcore</TargetProfile>
35 <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
36 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
37 - <!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
38 - <AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
39 <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
42 @@ -430,8 +424,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
43 <TargetProfile>netcore</TargetProfile>
44 <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
45 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
46 - <!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
47 - <AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
48 <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
55 From e57cb16ee7927bb31b2c9b63e1b2e394bf9f9932 Mon Sep 17 00:00:00 2001
56 From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
57 Date: Mon, 1 Aug 2016 13:48:23 -0400
58 Subject: [PATCH 2/2] Remove dead code
60 Remove Mono workarounds for missing files. Mono has been
61 shipping the files for some time now.
63 .../FSharp.Build/Microsoft.Portable.FSharp.Targets | 52 ----------------------
64 1 file changed, 52 deletions(-)
66 diff --git a/src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets b/src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets
67 index 8c99ab6..ee5f9b1 100644
68 --- a/src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets
69 +++ b/src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets
70 @@ -24,60 +24,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
71 Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets') AND
72 !Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props')"/>
75 - <!-- Try to do it ourselves - Explicitly include contents of Microsoft.Portable.Core.props + Microsoft.FSharp.Targets + Microsoft.Portable.Core.targets -->
76 - <!-- START MONO 3.2.7 WORKAROUND PART 1 -->
78 - Condition="(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')) AND
79 - (!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props'))">
80 - <AvailablePlatforms>Any CPU</AvailablePlatforms>
82 - <TargetPlatformIdentifier>Portable</TargetPlatformIdentifier>
83 - <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
84 - <TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName>
86 - <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
87 - <NoStdLib>true</NoStdLib>
89 - <ImplicitlyExpandTargetFramework Condition="'$(ImplicitlyExpandTargetFramework)' == '' ">true</ImplicitlyExpandTargetFramework>
91 - <!-- END MONO 3.2.7 WORKAROUND PART 1 -->
94 <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
97 - <!-- START MONO 3.2.7 WORKAROUND PART 2 -->
99 - Condition="(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')) AND
100 - (!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props'))" >
101 - <ResolveReferencesDependsOn>
102 - $(ResolveReferencesDependsOn);
103 - ImplicitlyExpandTargetFramework;
104 - </ResolveReferencesDependsOn>
106 - <ImplicitlyExpandTargetFrameworkDependsOn>
107 - $(ImplicitlyExpandTargetFrameworkDependsOn);
108 - GetReferenceAssemblyPaths
109 - </ImplicitlyExpandTargetFrameworkDependsOn>
112 - <Target Name="ImplicitlyExpandTargetFramework"
113 - DependsOnTargets="$(ImplicitlyExpandTargetFrameworkDependsOn)"
114 - Condition="(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')) AND
115 - (!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props'))" >
118 - <ReferenceAssemblyPaths Include="$(_TargetFrameworkDirectories)"/>
119 - <ReferencePath Include="%(ReferenceAssemblyPaths.Identity)\*.dll">
120 - <CopyLocal>false</CopyLocal>
121 - <ResolvedFrom>ImplicitlyExpandTargetFramework</ResolvedFrom>
122 - <IsSystemReference>True</IsSystemReference>
126 - <!-- END MONO 3.2.7 WORKAROUND PART 2 -->
128 <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.targets"
129 Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props')"/>