Merge remote-tracking branch 'monodevelop/dotnetcore' into vNext

1 files changed, 11 insertions, 1 deletions

diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
index 01b78a04dc..73ae0e9219 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
@@ -81,8 +81,18 @@ namespace MonoDevelop.Autotools
 
 		public XmlElement Write ()
 		{
+			string xmlns = MSBuildProject.Schema;
+			var msbuildProject = ownerProject?.MSBuildProject;
+			if (msbuildProject != null)
+				xmlns = msbuildProject.Namespace;
+
+			return Write (xmlns);
+		}
+
+		XmlElement Write (string xmlns)
+		{
 			XmlDataSerializer ser = new XmlDataSerializer (new DataContext ());
-			ser.Namespace = MSBuildProject.Schema;
+			ser.Namespace = xmlns;
 			var sw = new StringWriter ();
 			ser.Serialize (new XmlTextWriter (sw), this);
 			XmlDocument doc = new XmlDocument ();