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

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignTargetPathTest.cs
View File

@@ -158,11 +158,11 @@ namespace MonoTests.Microsoft.Build.Tasks
Assert.AreEqual(files.Length, include.Count, id + "2");
for (int i = 0; i < files.Length; i++) {
Assert.AreEqual (files [i], include [i].FinalItemSpec, id + "3, file #" + i);
Assert.AreEqual (files [i], include [i].FinalItemSpec.Replace ("\\", "/"), id + "3, file #" + i);
Assert.IsTrue (include[i].HasMetadata ("TargetPath"), id + "4, file #" + i + ", TargetPath metadata missing");
Assert.AreEqual (assignedFiles [i], include[i].GetMetadata("TargetPath"), id + "5, file #" + i);
Assert.IsTrue (include [i].HasMetadata ("Child"), id + "6, file #" + i + ", Child metadata missing");
Assert.AreEqual ("C" + files [i], include [i].GetMetadata ("Child"), id + "7, file #" + i + ", Child metadata value incorrect");
Assert.AreEqual ("C" + files [i], include [i].GetMetadata ("Child").Replace ("\\", "/"), id + "7, file #" + i + ", Child metadata value incorrect");
}
}

13
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs
View File

@@ -301,7 +301,11 @@ namespace MonoTests.Microsoft.Build.Tasks {
Assert.Fail ("Build failed");
}
Assert.IsTrue (File.Exists (target_file), "A2");
Assert.AreEqual (FileAttributes.Normal, File.GetAttributes (target_file), "A3");
if (Environment.OSVersion.Platform == PlatformID.Unix)
Assert.AreEqual (FileAttributes.Normal, File.GetAttributes (target_file), "A3");
else
// On Windows the Archive attribute will be set, not the Normal attribute.
Assert.AreEqual (FileAttributes.Archive, File.GetAttributes (target_file), "A3");
}
[Test]
@@ -349,7 +353,12 @@ namespace MonoTests.Microsoft.Build.Tasks {
Assert.Fail ("Build failed " + sb.ToString ());
}
Assert.IsTrue (File.Exists (target_file), "A2");
Assert.AreEqual (FileAttributes.Normal, File.GetAttributes (target_file), "A3");
var target_file_attrs = File.GetAttributes (target_file);
if (Environment.OSVersion.Platform == PlatformID.Unix)
Assert.AreEqual (FileAttributes.Normal, File.GetAttributes (target_file), "A3");
else
// On Windows the Archive attribute will be set, not the Normal attribute.
Assert.AreEqual (FileAttributes.Archive, File.GetAttributes (target_file), "A3");
}
[Test]

4
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs
View File

@@ -291,7 +291,7 @@ namespace MonoTests.Microsoft.Build.Tasks {
mc.ARFC (c1);
mc.ACLC (c2);
Assert.AreEqual ("/debug+", c1.ToString (), "A1");
Assert.AreEqual ("/debug:portable", c1.ToString (), "A1");
Assert.AreEqual (String.Empty, c2.ToString (), "A2");
}
@@ -366,7 +366,7 @@ namespace MonoTests.Microsoft.Build.Tasks {
mc.ARFC (c1);
mc.ACLC (c2);
Assert.AreEqual ("/keyfile:A", c1.ToString (), "A1");
Assert.AreEqual ("/keyfile:A /publicsign", c1.ToString (), "A1");
Assert.AreEqual (String.Empty, c2.ToString (), "A2");
}

3
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/WriteLinesToFileTest.cs
View File

@@ -115,6 +115,9 @@ namespace MonoTests.Microsoft.Build.Tasks {
[Test]
public void TestLineWithEscapedQuote ()
{
if (Environment.OSVersion.Platform != PlatformID.Unix) {
Assert.Ignore ("Throws \"Illegal characters in path\" on Windows since \" is not a legal Windows path character");
}
string[] lines = new string[] { "%22abc test%22 123 %22def%22" };
CreateProjectAndCheck (full_filepath, lines, false, true, delegate () {
CheckFileExists (full_filepath, true);

15
mcs/class/Microsoft.Build.Tasks/Test/test-config-file-net-4.0
View File

@@ -1,15 +0,0 @@
<?xml version ="1.0"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>