diff options
author | Atsushi Eno <atsushieno@gmail.com> | 2014-01-28 22:21:18 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@gmail.com> | 2014-02-20 13:22:40 +0400 |
commit | 8140531d91675fd37b9f8e7b42c76098e585083b (patch) | |
tree | 1787b1e1f237e289b3d72960f021916ce3d9a72d /mcs/class/Microsoft.Build/Test | |
parent | 03fc8b7fd954d95e342ca7b620c85ea550af727d (diff) |
Fix ElementLocation.File to NOT contain file URI, and then load task assembly from correct paths.
Diffstat (limited to 'mcs/class/Microsoft.Build/Test')
-rw-r--r-- | mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectInstanceTest.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectInstanceTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectInstanceTest.cs index 139a52b1108..b8a301a372a 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectInstanceTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectInstanceTest.cs @@ -161,12 +161,12 @@ namespace MonoTests.Microsoft.Build.Execution public void FirstUsingTaskTakesPrecedenceCommon (bool importFirst, bool buildShouldSucceed) { - string thisAssembly = GetType ().Assembly.GetName ().Name; + string thisAssembly = new Uri (GetType ().Assembly.CodeBase).LocalPath; string filename = "Test/ProjectTargetInstanceTest.FirstUsingTaskTakesPrecedence.Import.proj"; string imported_xml = string.Format (@"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'> - <UsingTask TaskName='MonoTests.Microsoft.Build.Execution.MyTask' AssemblyFile='{0}.dll' /> + <UsingTask TaskName='MonoTests.Microsoft.Build.Execution.MyTask' AssemblyFile='{0}' /> </Project>", thisAssembly); - string usingTask = string.Format ("<UsingTask TaskName='MonoTests.Microsoft.Build.Execution.SubNamespace.MyTask' AssemblyFile='{0}.dll' />", thisAssembly); + string usingTask = string.Format ("<UsingTask TaskName='MonoTests.Microsoft.Build.Execution.SubNamespace.MyTask' AssemblyFile='{0}' />", thisAssembly); string import = string.Format ("<Import Project='{0}' />", filename); string project_xml = string.Format (@"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'> {0} |