You've already forked linux-packaging-mono
Imported Upstream version 5.0.0.42
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
1190d13a04
commit
6bdd276d05
@@ -15,6 +15,8 @@ LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE
|
||||
TEST_MCS_FLAGS =
|
||||
TEST_LIB_REFS = $(PARENT_PROFILE)System.Xml $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(XBUILD_TASKS) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Core
|
||||
|
||||
TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE)
|
||||
|
||||
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
|
||||
TEST_LIB_REFS += Microsoft.Build
|
||||
endif
|
||||
@@ -23,8 +25,7 @@ EXTRA_DISTFILES = \
|
||||
Test/resources/test.cs \
|
||||
Test/resources/Sample.cs \
|
||||
Test/resources/Sample.vb \
|
||||
Test/resources/junk.txt \
|
||||
Test/test-config-file*
|
||||
Test/resources/junk.txt
|
||||
|
||||
Test/resources/test.dll: Test/resources/test.cs
|
||||
$(CSCOMPILE) -target:library /out:$@ $<
|
||||
|
||||
@@ -219,7 +219,7 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected override string ToolName {
|
||||
get {
|
||||
return MSBuildUtils.RunningOnWindows ? "mcs.bat" : "mcs.exe";
|
||||
return MSBuildUtils.RunningOnWindows ? "csc.bat" : "csc.exe";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -67,12 +67,15 @@ namespace Microsoft.Build.Tasks {
|
||||
commandLine.AppendSwitch ("/delaysign-");
|
||||
if (Bag ["EmitDebugInformation"] != null)
|
||||
if (EmitDebugInformation)
|
||||
commandLine.AppendSwitch ("/debug+");
|
||||
commandLine.AppendSwitch ("/debug:portable");
|
||||
else
|
||||
commandLine.AppendSwitch ("/debug-");
|
||||
//fileAlignment
|
||||
commandLine.AppendSwitchIfNotNull ("/keycontainer:", KeyContainer);
|
||||
commandLine.AppendSwitchIfNotNull ("/keyfile:", KeyFile);
|
||||
if (KeyFile != null && !DelaySign)
|
||||
commandLine.AppendSwitch("/publicsign");
|
||||
|
||||
// FIXME: add ids from metadata
|
||||
if (LinkResources != null)
|
||||
foreach (ITaskItem item in LinkResources)
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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>
|
||||
Reference in New Issue
Block a user