In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks:

	* Csc.cs (AddResponseFileCommands): Split DefineConstants on space also.

In class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks:
	* CscTest.cs (TestDefineConstants): Update DefineConstants to include
	spaces also.

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

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
index c65dc2011142f0489d7c2f1f7da39cffa857c467..883c1a2773fc5385ae49751971ec35107f8c669e 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-07  Ankit Jain  <jankit@novell.com>
+
+       * Csc.cs (AddResponseFileCommands): Split DefineConstants on space also.
+
 2009-06-07  Ankit Jain  <jankit@novell.com>
 
        * AssignTargetPath.cs (Execute): Expand incoming path to absolute

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
index a4b4d2aaf6de6d3ab7859c3cd171c402b8916bb8..cd2d8241fb1c65f3c5d57c0f85dd704357342c1d 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
@@ -62,7 +62,7 @@ namespace Microsoft.Build.Tasks {
                                        commandLine.AppendSwitch ("/checked-");
 
                        if (!String.IsNullOrEmpty (DefineConstants)) {
-                               string [] defines = DefineConstants.Split (new char [] {';'},
+                               string [] defines = DefineConstants.Split (new char [] {';', ' '},
                                                StringSplitOptions.RemoveEmptyEntries);
                                if (defines.Length > 0)
                                        commandLine.AppendSwitchUnquotedIfNotNull ("/define:",

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog
index ff87d49f1a4311f01ab0d6f9b3b378a153f8a5da..8ff217c0113aa7ec69ad71318b3ce1d04d0d685e 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-07  Ankit Jain  <jankit@novell.com>
+
+       * CscTest.cs (TestDefineConstants): Update DefineConstants to include
+       spaces also.
+
 2009-06-07  Ankit Jain  <jankit@novell.com>
 
        * AssignTargetPathTest.cs: Update tests to not depend on a fixed

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
index 95914032a9736ccf887f478d7e4a96dd4ec23480..46019d7d57f8f1c2cbd16d73607731cbfb85a485 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
@@ -348,11 +348,11 @@ namespace MonoTests.Microsoft.Build.Tasks {
                        CommandLineBuilderExtension c1 = new CommandLineBuilderExtension ();
                        CommandLineBuilderExtension c2 = new CommandLineBuilderExtension ();
 
-                       csc.DefineConstants = "A;B;;CD;;;Foo";
+                       csc.DefineConstants = "A;B;;CD;;;Foo  Bar";
                        csc.ARFC (c1);
                        csc.ACLC (c2);
 
-                       Assert.AreEqual ("/define:A;B;CD;Foo", c1.ToString (), "A1");
+                       Assert.AreEqual ("/define:A;B;CD;Foo;Bar", c1.ToString (), "A1");
                        Assert.AreEqual (String.Empty, c2.ToString (), "A2");
                }