Merge pull request fsprojects#963 from fsharp/xammac-condition

Added condition based on XamMac verion 1.13 rather than msbuild conditio...
VincentDondain · Mar 2, 2015 · 499c5c1 · 499c5c1
2 parents a008fe9 + ab147da
commit 499c5c1
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig b/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig
@@ -516,10 +516,9 @@
 			<FileTemplate id="FSharpXamMacWindowWithControllerXib" file ="Templates/MonoMac/XamMac/XamMacWindowWithControllerXib.xft.xml"/>
 		</Condition>
 
-    <!-- Normally the condition would be <Condition id="XamMacInstalled"> but the msbuild target for F# will be installed with the next version of monomac-->
-    <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets">
-      <FileTemplate id="FSharpXamMac2WindowWithController" file="Templates/MonoMac/XamMacUnified/Files/WindowWithController.xft.xml"/>
-    </Condition>
+        <Condition id="XamMac2Installed" minVersion="1.13">
+            <FileTemplate id="FSharpXamMac2WindowWithController" file="Templates/MonoMac/XamMacUnified/Files/WindowWithController.xft.xml"/>
+        </Condition>
 	</Extension>
 
 	<Extension path="/MonoDevelop/Ide/ProjectTemplates">
@@ -533,12 +532,11 @@
 			<ProjectTemplate id="FSharpXamMacProjectEmpty" file="Templates/MonoMac/XamMac/XamMacProjectEmpty.xpt.xml"/>
 		</Condition>
 
-    <!-- Normally the condition would be <Condition id="XamMacInstalled"> but the msbuild target for F# will be installed with the next version of monomac-->
-    <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets">
-        <ProjectTemplate id="XamMac2Application" file="Templates/MonoMac/XamMacUnified/Projects/Application.xpt.xml"/>
-        <ProjectTemplate id="XamMac2Library" file="Templates/MonoMac/XamMacUnified/Projects/Library.xpt.xml"/>
-        <ProjectTemplate id="XamMac2EmptyApplication" file="Templates/MonoMac/XamMacUnified/Projects/EmptyApplication.xpt.xml"/>
-    </Condition>
+        <Condition id="XamMac2Installed" minVersion="1.13">
+            <ProjectTemplate id="XamMac2Application" file="Templates/MonoMac/XamMacUnified/Projects/Application.xpt.xml"/>
+            <ProjectTemplate id="XamMac2Library" file="Templates/MonoMac/XamMacUnified/Projects/Library.xpt.xml"/>
+            <ProjectTemplate id="XamMac2EmptyApplication" file="Templates/MonoMac/XamMacUnified/Projects/EmptyApplication.xpt.xml"/>
+        </Condition>
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes/MonoDevelop.MonoMac.XamMac2Project">