diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-31 01:41:53 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-31 01:41:53 +0300 |
commit | 2439f17bef29b0bf5ae4fc81a1e7f96514810ff5 (patch) | |
tree | 7947886972b097e6958bf668c6da332813d0ffd3 /mcs/class/Microsoft.Build | |
parent | 9a287c04126d095e7371afee32632febd0dafd93 (diff) |
Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"
This reverts commit 9a287c04126d095e7371afee32632febd0dafd93, reversing
changes made to 4a79280b3bef8d5f15da9ddd2a2af3a03e194b03.
It breaks tons of tests.
Diffstat (limited to 'mcs/class/Microsoft.Build')
-rw-r--r-- | mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs | 13 |
1 files changed, 2 insertions, 11 deletions
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 8a0a2991f24..2fbb9f18587 100644 --- 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"); } |