Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"

[mono.git] / mcs / class / Microsoft.Build / Test / Microsoft.Build.Construction / ProjectRootElementTest.cs

diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
index 8a0a2991f24c5a0a7ae7df315f2bc8d360d7ae98..2fbb9f18587853bd786d5125f7e73cd2a2a68e7f 100644 (file)
--- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
@@ -30,13 +30,8 @@ namespace MonoTests.Microsoft.Build.Construction
                        var xml = XmlReader.Create (new StringReader (empty_project_xml), null, "file:///foo.xml");
                        // This creator does not fill FullPath...
                        var root = ProjectRootElement.Create (xml);
-
-                       // Expected to run from mcs/class/lib/profile
-                       var dir_name = Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath);
-                       var namespace_path = Path.Combine (Directory.GetParent (dir_name).Parent.FullName, "Microsoft.Build");
-
                        Assert.IsNull (root.FullPath, "#2");
-                       Assert.AreEqual (namespace_path, root.DirectoryPath, "#3");
+                       Assert.AreEqual (Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath), root.DirectoryPath, "#3");
                }
 
                [Test]
@@ -44,11 +39,7 @@ namespace MonoTests.Microsoft.Build.Construction
                {
                        var root = ProjectRootElement.Create ();
                        root.FullPath = "test" + Path.DirectorySeparatorChar + "foo.xml";
-
-                       // Expected to run from mcs/class/lib/profile
-                       var dir_name = Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath);
-                       var namespace_path = Path.Combine (Directory.GetParent (dir_name).Parent.FullName, "Microsoft.Build");
-                       var full = Path.Combine (namespace_path, "test", "foo.xml");
+                       var full = Path.Combine (Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath), "test", "foo.xml");
                        Assert.AreEqual (full, root.FullPath, "#1");
                        Assert.AreEqual (Path.GetDirectoryName (full), root.DirectoryPath, "#1");
                }