--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig.old 2015-06-03 19:53:00.116849746 +0100 +++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig 2015-06-03 19:56:30.112579384 +0100 @@ -130,6 +130,11 @@ <!-- New projects will be created with this targets file. --> <Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes"> <!-- If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' --> + <Condition id="MSBuildTargetIsAvailable" target="$(FSharpTargetsPath)" > + <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(FSharpTargetsPath)" resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/> + </Condition> + + <!-- If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' --> <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" > <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"/> </Condition> @@ -182,14 +187,7 @@ <ProjectTemplate id="FSharpConsoleProject" file="Templates/FSharpConsoleProject.xpt.xml"/> <ProjectTemplate id="FSharpLibraryProject" file="Templates/FSharpLibraryProject.xpt.xml"/> <!-- Only include the tutorial project if an F# 3.0 or 3.1 target is available as this includes F# 3.0 specific features --> - <ComplexCondition> - <Or> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> - </Or> <ProjectTemplate id="FSharpTutorialProject" file="Templates/FSharpTutorialProject.xpt.xml"/> - </ComplexCondition> - <ProjectTemplate id="FSharpGtkProject" file="Templates/FSharpGtkProject.xpt.xml"/> <ProjectTemplate id="FSharpNUnitLibraryProject" file="Templates/FSharpNUnitLibraryProject.xpt.xml"/> </Extension> @@ -267,13 +265,7 @@ <!-- F# interactive --> <Extension path="/MonoDevelop/Ide/Pads"> - <ComplexCondition> - <Or> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> - </Or> <Pad id="MonoDevelop.FSharp.FSharpInteractivePad" defaultPlacement="Bottom" _label="F# Interactive" icon="md-project" class="MonoDevelop.FSharp.FSharpInteractivePad" /> - </ComplexCondition> </Extension> <Extension path = "/MonoDevelop/Ide/Pads/ProjectPad"> @@ -281,11 +273,6 @@ </Extension> <Extension path="/MonoDevelop/Ide/Commands"> - <ComplexCondition> - <Or> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> - </Or> <Category _name = "F# Integration" id="F# Integration"> <Command id="MonoDevelop.FSharp.FSharpCommands.ShowFSharpInteractive" _label = "F# Interactive" @@ -330,32 +317,19 @@ macShortcut="Meta|Control|C" shortcut="Ctrl|Alt|C" /> </Category> - </ComplexCondition> </Extension> <Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor"> - <ComplexCondition> - <Or> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> - </Or> <SeparatorItem id = "FSharpInteractiveStart" /> <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" /> <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" /> <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" /> - </ComplexCondition> </Extension> <Extension path = "/MonoDevelop/Ide/MainMenu/Edit"> - <ComplexCondition> - <Or> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> - </Or> <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" /> <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" /> <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" /> - </ComplexCondition> </Extension> <!--- F# Android -->