mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs
View File

@@ -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_4_0
using System;
using System.IO;
using System.Linq;
@@ -116,10 +115,10 @@ Log.LogWarning(""Message: "" + Message);
AssemblyFile='$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll' >
<ParameterGroup />
<Task>
<Reference Include='System.Drawing' />
<Reference Include='System.Runtime.Serialization' />
<Code Type='Fragment' Language='cs'>
<![CDATA[
Log.LogWarning(""Color: "" + System.Drawing.Color.CornflowerBlue);
Log.LogWarning(""A GUID generated by System.Xml: "" + new System.Xml.UniqueId());
]]> </Code>
</Task>
</UsingTask>
@@ -207,4 +206,3 @@ Log.LogWarning(""Color: "" + System.Drawing.Color.CornflowerBlue);
}
}
#endif

14
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
View File

@@ -44,20 +44,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
public void ARFC (CommandLineBuilderExtension commandLine)
{
base.AddResponseFileCommands (commandLine);
#if !NET_4_0
string s = commandLine.ToString ();
if (s.Length == 6)
Assert.AreEqual ("/sdk:2", s);
else
Assert.AreEqual ("/sdk:2 ", s.Substring (0, 7));
BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
PropertyInfo pi = typeof (CommandLineBuilderExtension).GetProperty ("CommandLine", flags);
System.Text.StringBuilder sb = (System.Text.StringBuilder) pi.GetValue (commandLine, null);
sb.Length = 0;
if (s.Length > 6)
sb.Append (s.Substring (7));
#endif
}
public void ACLC (CommandLineBuilderExtension commandLine)