Skip to content

Commit 158a0f1

Browse files
mhutchjonpryor
authored andcommitted
[Xamarin.Android.Build.Tasks] Update F# targets imports (#141)
* Make consistent with xamarin-ios * Add modern `$(VisualStudioVersion)`-based import * Add 4.0 import, remove 3.0 import
1 parent 85f9302 commit 158a0f1

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

src/Xamarin.Android.Build.Tasks/Xamarin.Android.FSharp.targets

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,20 @@ Copyright (C) 2012 Xamarin. All rights reserved.
3333
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
3434
<_AndroidResourceDesigner>Resource.Designer.fs</_AndroidResourceDesigner>
3535
</PropertyGroup>
36-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets') AND !Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')" />
37-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')" />
36+
37+
<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element, so we can't determine this with a variable -->
38+
<Import
39+
Condition="'$(Language)' == '' And Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')"
40+
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets" />
41+
<Import
42+
Condition="'$(Language)' == '' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"
43+
Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
44+
<Import
45+
Condition="'$(Language)' == '' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"
46+
Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
47+
3848
<Import Project="Xamarin.Android.Common.targets" />
49+
3950
<!--
4051
*******************************************
4152
Extensibility hook that allows VS to

0 commit comments

Comments
 (0)