Skip to content

Commit 3ba867f

Browse files
dsymedsyme
authored
Merge pull request #596 from mhutch/remove-mono-workarounds
Remove old Mono workarounds
2 parents 4c0006c + 601ccad commit 3ba867f

File tree

2 files changed

+0
-60
lines changed

2 files changed

+0
-60
lines changed

‎src/FSharpSource.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
367367
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
368368
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
369369

370-
<!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
371-
<AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.0\mscorlib.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.0</AssemblySearchPaths>
372370
<TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
373371
<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.0</TargetFrameworkVersion>
374372
</PropertyGroup>
@@ -410,8 +408,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
410408
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
411409
<TargetProfile>netcore</TargetProfile>
412410
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
413-
<!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
414-
<AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
415411
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
416412
<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
417413
</PropertyGroup>
@@ -453,8 +449,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
453449
<TargetProfile>netcore</TargetProfile>
454450
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
455451
<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
456-
<!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
457-
<AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
458452
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
459453
</PropertyGroup>
460454

@@ -495,8 +489,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
495489
<TargetProfile>netcore</TargetProfile>
496490
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
497491
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
498-
<!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
499-
<AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
500492
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
501493
</PropertyGroup>
502494

‎src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.targets

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -24,60 +24,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
2424
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets') AND
2525
!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props')"/>
2626

27-
28-
<!-- Try to do it ourselves - Explicitly include contents of Microsoft.Portable.Core.props + Microsoft.FSharp.Targets + Microsoft.Portable.Core.targets -->
29-
<!-- START MONO 3.2.7 WORKAROUND PART 1 -->
30-
<PropertyGroup
31-
Condition="(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')) AND
32-
(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props'))">
33-
<AvailablePlatforms>Any CPU</AvailablePlatforms>
34-
35-
<TargetPlatformIdentifier>Portable</TargetPlatformIdentifier>
36-
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
37-
<TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName>
38-
39-
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
40-
<NoStdLib>true</NoStdLib>
41-
42-
<ImplicitlyExpandTargetFramework Condition="'$(ImplicitlyExpandTargetFramework)' == '' ">true</ImplicitlyExpandTargetFramework>
43-
</PropertyGroup>
44-
<!-- END MONO 3.2.7 WORKAROUND PART 1 -->
45-
46-
4727
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
4828

49-
50-
<!-- START MONO 3.2.7 WORKAROUND PART 2 -->
51-
<PropertyGroup
52-
Condition="(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')) AND
53-
(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props'))" >
54-
<ResolveReferencesDependsOn>
55-
$(ResolveReferencesDependsOn);
56-
ImplicitlyExpandTargetFramework;
57-
</ResolveReferencesDependsOn>
58-
59-
<ImplicitlyExpandTargetFrameworkDependsOn>
60-
$(ImplicitlyExpandTargetFrameworkDependsOn);
61-
GetReferenceAssemblyPaths
62-
</ImplicitlyExpandTargetFrameworkDependsOn>
63-
</PropertyGroup>
64-
65-
<Target Name="ImplicitlyExpandTargetFramework"
66-
DependsOnTargets="$(ImplicitlyExpandTargetFrameworkDependsOn)"
67-
Condition="(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')) AND
68-
(!Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props'))" >
69-
70-
<ItemGroup>
71-
<ReferenceAssemblyPaths Include="$(_TargetFrameworkDirectories)"/>
72-
<ReferencePath Include="%(ReferenceAssemblyPaths.Identity)\*.dll">
73-
<CopyLocal>false</CopyLocal>
74-
<ResolvedFrom>ImplicitlyExpandTargetFramework</ResolvedFrom>
75-
<IsSystemReference>True</IsSystemReference>
76-
</ReferencePath>
77-
</ItemGroup>
78-
</Target>
79-
<!-- END MONO 3.2.7 WORKAROUND PART 2 -->
80-
8129
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.targets"
8230
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props')"/>
8331

0 commit comments

Comments
 (0)