diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2017-01-23 20:12:28 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2017-01-23 20:12:28 +0300 |
| commit | a5a800f0e2763912d739e9b4d8a78ae1c10a00b2 (patch) | |
| tree | 4477b0fffa31f163a024d91ac131aaf69e3f9606 | |
| parent | 67a406fe24df088dc95c32e4e9bd6f771cd7989a (diff) | |
[Core] Use MSBuildProject's namespace when patching imports
This allows Sdk style projects to have any imports patched and no
xmlns attribute is added to the generated Import elements.
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs | 4 | ||||
| -rw-r--r-- | main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs index c64ab829ce..20964d9e74 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs @@ -99,7 +99,7 @@ namespace MonoDevelop.Projects.MSBuild if (!string.IsNullOrEmpty (Condition)) cond = "( " + Condition + " ) AND " + cond; - writer.WriteStartElement ("Import", MSBuildProject.Schema); + writer.WriteStartElement ("Import", Namespace); writer.WriteAttributeString ("Project", target); writer.WriteAttributeString ("Condition", cond); writer.WriteEndElement (); @@ -111,7 +111,7 @@ namespace MonoDevelop.Projects.MSBuild if (!string.IsNullOrEmpty (Condition)) cond = "( " + Condition + " ) AND " + cond; - writer.WriteStartElement ("Import", MSBuildProject.Schema); + writer.WriteStartElement ("Import", Namespace); writer.WriteAttributeString ("Project", MSBuildProjectService.ToMSBuildPath (null, newTarget)); writer.WriteAttributeString ("Condition", cond); writer.WriteEndElement (); diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs index 668a698619..f39cffedaf 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs @@ -923,6 +923,7 @@ namespace MonoDevelop.Projects Assert.IsFalse (test3Element.HasAttribute ("xmlns")); } + [TestCase ("Sdk=\"Microsoft.NET.Sdk\" ToolsVersion=\"15.0\"")] [TestCase ("ToolsVersion=\"15.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\"")] public void PatchedImport (string projectElementAttributes) { |