Author: msierad
Date: 2006-05-26 03:26:18 -0400 (Fri, 26 May 2006)
New Revision: 61154
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Message.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/SignFile.cs
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
Log:
2006-05-26 Marek Sieradzki <[EMAIL PROTECTED]>
* RegisterAssembly.cs, SignFile.cs, GenerateTrustInfo.cs,
CreateItem.cs, UnregisterAssembly.cs, Csc.cs: Changed various return
null and return true to NotImplementedException;
* Error.cs: Changed to use helpKeyword and code.
* GetFrameworkSdkPath.cs, GetFrameworkPath.cs: Changed to use
Mono.XBuild.Utilities.MonoLocationHelper.
* Message.cs: Fixed to use proper MessageImportance and removed error
logging.
* ManagedCompiler.cs: Added MonoTODO and ListHasNoDuplicateItems ().
* GenerateResource.cs: Fixed wrong if block.
Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -43,6 +43,7 @@
{
}
+ [MonoTODO]
protected internal override void AddResponseFileCommands (
CommandLineBuilderExtension
commandLine)
{
Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
2006-05-26 07:26:18 UTC (rev 61154)
@@ -1,3 +1,16 @@
+2006-05-26 Marek Sieradzki <[EMAIL PROTECTED]>
+
+ * RegisterAssembly.cs, SignFile.cs, GenerateTrustInfo.cs,
+ CreateItem.cs, UnregisterAssembly.cs, Csc.cs: Changed various return
+ null and return true to NotImplementedException;
+ * Error.cs: Changed to use helpKeyword and code.
+ * GetFrameworkSdkPath.cs, GetFrameworkPath.cs: Changed to use
+ Mono.XBuild.Utilities.MonoLocationHelper.
+ * Message.cs: Fixed to use proper MessageImportance and removed error
+ logging.
+ * ManagedCompiler.cs: Added MonoTODO and ListHasNoDuplicateItems ().
+ * GenerateResource.cs: Fixed wrong if block.
+
2006-05-22 Marek Sieradzki <[EMAIL PROTECTED]>
* Message.cs: Made messageImportance local variable.
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -27,6 +27,7 @@
#if NET_2_0
+using System;
using Microsoft.Build.Framework;
namespace Microsoft.Build.Tasks {
@@ -42,7 +43,7 @@
public override bool Execute ()
{
- return true;
+ throw new NotImplementedException ();
}
public string[] AdditionalMetadata {
@@ -63,4 +64,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -27,6 +27,7 @@
#if NET_2_0
+using System;
using Microsoft.Build.Framework;
namespace Microsoft.Build.Tasks {
@@ -41,7 +42,7 @@
public override bool Execute ()
{
- return true;
+ throw new NotImplementedException ();
}
[Output]
@@ -58,4 +59,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -40,6 +40,7 @@
{
}
+ [MonoTODO]
protected internal override void AddResponseFileCommands
(CommandLineBuilderExtension commandLine)
{
base.AddResponseFileCommands (commandLine);
@@ -61,9 +62,10 @@
//warningNotAsErrors
}
+ [MonoTODO]
protected override bool CallHostObjectToExecute ()
{
- return true;
+ throw new NotImplementedException ();
}
protected override string GenerateFullPathToTool ()
@@ -71,6 +73,7 @@
return Path.Combine (ToolPath, ToolName);
}
+ [MonoTODO]
protected override HostObjectInitializationStatus
InitializeHostObject ()
{
return
HostObjectInitializationStatus.NoActionReturnSuccess;
Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -40,7 +40,7 @@
public override bool Execute ()
{
- this.Log.LogError (null, null, null,
BuildEngine.ProjectFileOfTaskNode,
+ this.Log.LogError (null, code, helpKeyword,
BuildEngine.ProjectFileOfTaskNode,
BuildEngine.LineNumberOfTaskNode,
BuildEngine.ColumnNumberOfTaskNode,
BuildEngine.LineNumberOfTaskNode,
BuildEngine.ColumnNumberOfTaskNode,
text, null);
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -85,9 +85,10 @@
Log.LogErrorFromException (new
Exception ("Filename of output can not be empty."));
return false;
}
- if (CompileResourceFile (sourceFile,
outputFile) == false)
+ if (CompileResourceFile (sourceFile,
outputFile) == false) {
Log.LogErrorFromException (new
Exception ("Error during compiling resource file."));
return false;
+ }
temporaryFilesWritten.Add
(outputEnum.Current);
}
}
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -27,6 +27,7 @@
#if NET_2_0
+using System;
using Microsoft.Build.Framework;
namespace Microsoft.Build.Tasks {
@@ -43,7 +44,7 @@
public override bool Execute ()
{
- return true;
+ throw new NotImplementedException ();
}
public ITaskItem BaseManifest {
@@ -86,4 +87,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -28,6 +28,7 @@
#if NET_2_0
using Microsoft.Build.Framework;
+using Mono.XBuild.Utilities;
namespace Microsoft.Build.Tasks {
public class GetFrameworkPath : TaskExtension {
@@ -40,7 +41,7 @@
public override bool Execute ()
{
- path = "/usr/local/bin";
+ path = MonoLocationHelper.GetBinDir ();
return true;
}
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -28,6 +28,7 @@
#if NET_2_0
using Microsoft.Build.Framework;
+using Mono.XBuild.Utilities;
namespace Microsoft.Build.Tasks {
public class GetFrameworkSdkPath : TaskExtension {
@@ -40,7 +41,7 @@
public override bool Execute ()
{
- path = "/usr/local/bin";
+ path = MonoLocationHelper.GetBinDir ();
return true;
}
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -28,6 +28,7 @@
#if NET_2_0
using System;
+using System.Collections;
using System.IO;
using System.Text;
using Microsoft.Build.Framework;
@@ -39,11 +40,13 @@
{
}
+ [MonoTODO]
protected internal override void AddCommandLineCommands (
CommandLineBuilderExtension
commandLine)
{
}
+ [MonoTODO]
protected internal override void AddResponseFileCommands (
CommandLineBuilderExtension
commandLine)
{
@@ -98,6 +101,7 @@
commandLine.AppendSwitchIfNotNull ("/win32res:",
Win32Resource);
}
+ [MonoTODO]
protected bool CheckAllReferencesExistOnDisk ()
{
foreach (ITaskItem item in (ITaskItem[])Bag
["References"])
@@ -106,11 +110,13 @@
return true;
}
+ [MonoTODO]
protected void CheckHostObjectSupport (string parameterName,
bool
resultFromHostObjectSetOperation)
{
}
+ [MonoTODO]
protected override bool HandleTaskExecutionErrors ()
{
return true;
@@ -120,9 +126,19 @@
protected bool ListHasNoDuplicateItems (ITaskItem[] itemList,
string parameterName)
{
+ Hashtable items = new Hashtable ();
+
+ foreach (ITaskItem item in itemList) {
+ if (items.Contains (item.ItemSpec))
+ items.Add (item.ItemSpec, null);
+ else
+ return false;
+ }
+
return true;
}
+ [MonoTODO]
protected override bool ValidateParameters ()
{
return true;
Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Message.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Message.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Message.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -44,22 +44,23 @@
{
MessageImportance messageImportance;
+
+
+
if (importance == null)
messageImportance = MessageImportance.Normal;
- else if (importance == "Low")
+ else if (importance.ToLower () == "low")
messageImportance = MessageImportance.Low;
- else if (importance == "Normal")
+ else if (importance.ToLower () == "normal")
messageImportance = MessageImportance.Normal;
- else if (importance == "High")
+ else if (importance.ToLower () == "high")
messageImportance = MessageImportance.High;
else {
- Log.LogError (null, null, null,
BuildEngine.ProjectFileOfTaskNode,
- BuildEngine.LineNumberOfTaskNode,
BuildEngine.ColumnNumberOfTaskNode,
- BuildEngine.LineNumberOfTaskNode,
BuildEngine.ColumnNumberOfTaskNode,
- "Invalid Importance attribute.", null);
return false;
}
+
+
Log.LogMessage (messageImportance, text, null);
return true;
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -46,7 +46,7 @@
public override bool Execute ()
{
- return true;
+ throw new NotImplementedException ();
}
public void ReportEvent (ExporterEventKind kind, int code,
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/SignFile.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/SignFile.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/SignFile.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -45,7 +45,7 @@
[MonoTODO]
public override bool Execute ()
{
- return true;
+ throw new NotImplementedException ();
}
[Required]
Modified:
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
2006-05-26 07:16:31 UTC (rev 61153)
+++
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
2006-05-26 07:26:18 UTC (rev 61154)
@@ -27,6 +27,7 @@
#if NET_2_0
+using System;
using Microsoft.Build.Framework;
namespace Microsoft.Build.Tasks {
@@ -42,10 +43,9 @@
public override bool Execute ()
{
- return true;
+ throw new NotImplementedException ();
}
- // [Required]
public ITaskItem[] Assemblies {
get {
return assemblies;
@@ -75,4 +75,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
