X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Utilities%2FMicrosoft.Build.Utilities%2FTask.cs;h=2834c874cbe3fd2101f7b8aef79499d54889fdd1;hb=aef44c0fdc1890f869f9c48635e43693aee5b7af;hp=781d5fe40958a3d0f30929957f9dd4ebd1e73110;hpb=4a2ab0336e97f3591eebbb881a1471d3051946c9;p=mono.git

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 781d5fe4095..2834c874cbe 100644
--- 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;
@@ -37,9 +36,8 @@ namespace Microsoft.Build.Utilities
 	{
 		IBuildEngine		buildEngine;
 		string			helpKeywordPrefix;
-		object			hostObject;
+		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;
@@ -79,7 +81,7 @@ namespace Microsoft.Build.Utilities
 			}
 		}
 
-		public object HostObject {
+		public ITaskHost HostObject {
 			get {
 				return hostObject;
 			}
@@ -96,13 +98,12 @@ namespace Microsoft.Build.Utilities
 
 		protected ResourceManager TaskResources	{
 			get {
-				return taskResources;
+				return log.TaskResources;
 			}
 			set {
-				taskResources = value;
+				log.TaskResources = value;
 			}
 		}
 	}
 }
 
-#endif
\ No newline at end of file