tjh.dev
1--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig.old 2015-06-03 19:53:00.116849746 +0100
2+++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig 2015-06-03 19:56:30.112579384 +0100
3@@ -130,6 +130,11 @@
4 <!-- New projects will be created with this targets file. -->
5 <Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes">
6 <!-- If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' -->
7+ <Condition id="MSBuildTargetIsAvailable" target="$(FSharpTargetsPath)" >
8+ <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(FSharpTargetsPath)" resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/>
9+ </Condition>
10+
11+ <!-- If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' -->
12 <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" >
13 <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/>
14 </Condition>
15@@ -182,14 +187,7 @@
16 <ProjectTemplate id="FSharpConsoleProject" file="Templates/FSharpConsoleProject.xpt.xml"/>
17 <ProjectTemplate id="FSharpLibraryProject" file="Templates/FSharpLibraryProject.xpt.xml"/>
18 <!-- Only include the tutorial project if an F# 3.0 or 3.1 target is available as this includes F# 3.0 specific features -->
19- <ComplexCondition>
20- <Or>
21- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
22- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
23- </Or>
24 <ProjectTemplate id="FSharpTutorialProject" file="Templates/FSharpTutorialProject.xpt.xml"/>
25- </ComplexCondition>
26-
27 <ProjectTemplate id="FSharpGtkProject" file="Templates/FSharpGtkProject.xpt.xml"/>
28 <ProjectTemplate id="FSharpNUnitLibraryProject" file="Templates/FSharpNUnitLibraryProject.xpt.xml"/>
29 </Extension>
30@@ -267,13 +265,7 @@
31 <!-- F# interactive -->
32
33 <Extension path="/MonoDevelop/Ide/Pads">
34- <ComplexCondition>
35- <Or>
36- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
37- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
38- </Or>
39 <Pad id="MonoDevelop.FSharp.FSharpInteractivePad" defaultPlacement="Bottom" _label="F# Interactive" icon="md-project" class="MonoDevelop.FSharp.FSharpInteractivePad" />
40- </ComplexCondition>
41 </Extension>
42
43 <Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
44@@ -281,11 +273,6 @@
45 </Extension>
46
47 <Extension path="/MonoDevelop/Ide/Commands">
48- <ComplexCondition>
49- <Or>
50- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
51- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
52- </Or>
53 <Category _name = "F# Integration" id="F# Integration">
54 <Command id="MonoDevelop.FSharp.FSharpCommands.ShowFSharpInteractive"
55 _label = "F# Interactive"
56@@ -330,32 +317,19 @@
57 macShortcut="Meta|Control|C"
58 shortcut="Ctrl|Alt|C" />
59 </Category>
60- </ComplexCondition>
61 </Extension>
62
63 <Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
64- <ComplexCondition>
65- <Or>
66- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
67- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
68- </Or>
69 <SeparatorItem id = "FSharpInteractiveStart" />
70 <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" />
71 <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" />
72 <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" />
73- </ComplexCondition>
74 </Extension>
75
76 <Extension path = "/MonoDevelop/Ide/MainMenu/Edit">
77- <ComplexCondition>
78- <Or>
79- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
80- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
81- </Or>
82 <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" />
83 <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" />
84 <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" />
85- </ComplexCondition>
86 </Extension>
87
88 <!--- F# Android -->