In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:

	* Engine.cs (GetLoadedProject): Return null if project not found.
	Based on a patch by Dale Ragan <dale.ragan@sinesignal.com> .

In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:

	* EngineTest.cs (TestGetLoadedProject1):
	Patch by Dale Ragan <dale.ragan@sinesignal.com> .

svn path=/trunk/mcs/; revision=158400

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index b6d8d4047a14c982bb4373f60fa4b06418ef8adf..9ed9fb342dfa869892273230a61ebfd2ada6fdc2 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Ankit Jain  <jankit@novell.com>
+
+       * Engine.cs (GetLoadedProject): Return null if project not found.
+       Based on a patch by Dale Ragan <dale.ragan@sinesignal.com> .
+
 2010-05-28  Ankit Jain  <jankit@novell.com>
 
        Fix bug #485841.

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
index b6fe05eb2c630e8b14b8098e9403e2f726e860eb..e211551f9c7a469620d7a5694c41fa32744df5f2 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
@@ -283,8 +283,10 @@ namespace Microsoft.Build.BuildEngine {
                        if (projectFullFileName == null)
                                throw new ArgumentNullException ("projectFullFileName");
                        
-                       // FIXME: test it
-                       return projects [projectFullFileName];
+                       Project project;
+                       projects.TryGetValue (projectFullFileName, out project);
+
+                       return project;
                }
 
                internal void RemoveLoadedProject (Project p)

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
index c6084a139c698ebb9c28aa62252750c6bb906693..a35b494d0804ae1aedae739811e0b7bc6f48d868 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Ankit Jain  <jankit@novell.com>
+
+       * EngineTest.cs (TestGetLoadedProject1):
+       Patch by Dale Ragan <dale.ragan@sinesignal.com> .
+
 2010-04-06  Ankit Jain  <jankit@novell.com>
 
        * Consts.cs (ToolsVersionString): New.

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
index b64c1f5bcf141edbb791a8a7d34351e00b6118b0..49f229e70a15d3cf34c268f1555d7efabda52d54 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
@@ -810,6 +810,13 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                });
                }
 
+               [Test]
+               public void TestGetLoadedProject1()
+               {
+                       Project project = Engine.GlobalEngine.GetLoadedProject("foo.proj");
+                       Assert.IsNull(project);
+               }
+
                // Helper Methods for TestGlobalProperties*
 
                void CreateAndCheckGlobalPropertiesTest (string main, string first, string second,