Merge other targets files after the main xbd targets

Author: Redth

build.cake

@@ -368,28 +368,6 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").Does (() => {
 		var targetsFile = new FilePath(string.Format ("{0}/nuget/{1}.targets", aar.Path, aar.NugetId));
 		FileWriteText (targetsFile, targetsText);
 
-		// Check for an existing .targets file in this nuget package
-		// we need to merge the generated one with it if it exists
-		// nuget only allows one automatic .targets file in the build/ folder
-		// of the nuget package, which must be named {nuget-package-id}.targets
-		// so we need to merge them all into one
-		var mergeFile = new FilePath (aar.Path + "/nuget/merge.targets");
-
-		if (FileExists (mergeFile)) {
-			Information ("merge.targets found, merging into generated file...");
-
-			// Load the doc to append to, and the doc to append
-			var xOrig = System.Xml.Linq.XDocument.Load (MakeAbsolute(targetsFile).FullPath);
-			System.Xml.Linq.XNamespace nsOrig = xOrig.Root.Name.Namespace;
-			var xMerge = System.Xml.Linq.XDocument.Load (MakeAbsolute(mergeFile).FullPath);
-			System.Xml.Linq.XNamespace nsMerge = xMerge.Root.Name.Namespace;
-			// Add all the elements under <Project> into the existing file's <Project> node
-			foreach (var xItemToAdd in xMerge.Element (nsMerge + "Project").Elements ())
-				xOrig.Element (nsOrig + "Project").Add (xItemToAdd);
-
-			xOrig.Save (MakeAbsolute (targetsFile).FullPath);
-		}
-
 		// Merge each generated targets file into one main one
 		// this makes one file to import into our actual binding projects
 		// which is much easier/less maintenance
@@ -416,6 +394,28 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").Does (() => {
 		}
 
 		xFileRoot.Save ("./generated.targets");
+
+		// Check for an existing .targets file in this nuget package
+		// we need to merge the generated one with it if it exists
+		// nuget only allows one automatic .targets file in the build/ folder
+		// of the nuget package, which must be named {nuget-package-id}.targets
+		// so we need to merge them all into one
+		var mergeFile = new FilePath (aar.Path + "/nuget/merge.targets");
+
+		if (FileExists (mergeFile)) {
+			Information ("merge.targets found, merging into generated file...");
+
+			// Load the doc to append to, and the doc to append
+			var xOrig = System.Xml.Linq.XDocument.Load (MakeAbsolute(targetsFile).FullPath);
+			System.Xml.Linq.XNamespace nsOrig = xOrig.Root.Name.Namespace;
+			var xMerge = System.Xml.Linq.XDocument.Load (MakeAbsolute(mergeFile).FullPath);
+			System.Xml.Linq.XNamespace nsMerge = xMerge.Root.Name.Namespace;
+			// Add all the elements under <Project> into the existing file's <Project> node
+			foreach (var xItemToAdd in xMerge.Element (nsMerge + "Project").Elements ())
+				xOrig.Element (nsOrig + "Project").Add (xItemToAdd);
+
+			xOrig.Save (MakeAbsolute (targetsFile).FullPath);
+		}
 	}
 });