[xbuild] TaskLoggingHelper: Implement support for correctly using task resources

[mono.git] / mcs / class / Microsoft.Build.Utilities / Microsoft.Build.Utilities / Task.cs

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
index 622763420510eb854d2a4f4fc9273a09dc831e7a..2834c874cbe3fd2101f7b8aef79499d54889fdd1 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_2_0
 
 using System;
 using System.Resources;
@@ -39,7 +38,6 @@ namespace Microsoft.Build.Utilities
                string                  helpKeywordPrefix;
                ITaskHost               hostObject;
                TaskLoggingHelper       log;
-               ResourceManager         taskResources;
                
                protected Task()
                        : this (null, null)
@@ -54,7 +52,8 @@ namespace Microsoft.Build.Utilities
                protected Task(ResourceManager taskResources,
                               string helpKeywordPrefix)
                {
-                       this.taskResources = taskResources;
+                       log = new TaskLoggingHelper (this);
+                       log.TaskResources = taskResources;
                        this.helpKeywordPrefix = helpKeywordPrefix;
                }
 
@@ -66,10 +65,13 @@ namespace Microsoft.Build.Utilities
                        }
                        set {
                                buildEngine = value;
-                               log = new TaskLoggingHelper (this); 
                        }
                }
 
+               public IBuildEngine2 BuildEngine2 {
+                       get { return buildEngine as IBuildEngine2; }
+               }
+
                protected string HelpKeywordPrefix {
                        get {
                                return helpKeywordPrefix;
@@ -96,13 +98,12 @@ namespace Microsoft.Build.Utilities
 
                protected ResourceManager TaskResources {
                        get {
-                               return taskResources;
+                               return log.TaskResources;
                        }
                        set {
-                               taskResources = value;
+                               log.TaskResources = value;
                        }
                }
        }
 }
 
-#endif