Author: msierad
Date: 2006-07-17 14:11:18 -0400 (Mon, 17 Jul 2006)
New Revision: 62685

Modified:
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
   
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
Log:
2006-07-17  Marek Sieradzki  <[EMAIL PROTECTED]>

        * ManagedCompiler.cs: TargetType.Get: added null check.



Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog       
2006-07-17 18:03:09 UTC (rev 62684)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog       
2006-07-17 18:11:18 UTC (rev 62685)
@@ -1,3 +1,7 @@
+2006-07-17  Marek Sieradzki  <[EMAIL PROTECTED]>
+
+       * ManagedCompiler.cs: TargetType.Get: added null check.
+
 2006-06-25  Marek Sieradzki  <[EMAIL PROTECTED]>
 
        * Csc.cs: Changed ToolName to make it use gmcs.

Modified: 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
===================================================================
--- 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs  
    2006-07-17 18:03:09 UTC (rev 62684)
+++ 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs  
    2006-07-17 18:11:18 UTC (rev 62685)
@@ -94,7 +94,8 @@
                                                
commandLine.AppendFileNameIfNotNull (item.ItemSpec);
                                }
                        }
-                       commandLine.AppendSwitchIfNotNull ("/target:", 
TargetType);
+                       if (TargetType != null)
+                               commandLine.AppendSwitchIfNotNull ("/target:", 
TargetType);
                        if (TreatWarningsAsErrors)
                                commandLine.AppendSwitch ("/warnaserror");
                        commandLine.AppendSwitchIfNotNull ("/win32icon:", 
Win32Icon);
@@ -256,7 +257,9 @@
 
                // FIXME: hack to get build of hello world working
                public string TargetType {
-                       get { return ((string) Bag ["TargetType"]).ToLower (); }
+                       get {
+                               return  (Bag.Contains ("TargetType")) ? 
(((string) Bag ["TargetType"]).ToLower ()) : null;
+                       }
                        set { Bag ["TargetType"] = value; }
                }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to