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

Imported Upstream version 5.20.0.180

Browse Source 
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mcs/class/Microsoft.Build.Engine/Makefile
View File

@@ -11,13 +11,15 @@ LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE
KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
TEST_RESOURCE_FILES = \
$(wildcard Test/resources/*.csproj)
TEST_MCS_FLAGS = $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
TEST_LIB_REFS = $(XBUILD_FRAMEWORK) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Xml
TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE)
EXTRA_DISTFILES = \
Test/resources/TestTasks.cs \
Test/resources/*.*proj \
Test/resources/*.csproj
CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$(PROFILE).dll.mdb Test/resources/TestTasks-$(PROFILE).pdb
@@ -25,13 +27,13 @@ CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$
Test/resources/TestTasks-$(PROFILE).dll: Test/resources/TestTasks.cs
$(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)/mscorlib.dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library
test-local: compile-resources
TEST_MCS_FLAGS += -resource:Test/resources/TestTasks-$(PROFILE).dll,Test/resources/TestTasks.dll
compile-resources: Test/resources/TestTasks-$(PROFILE).dll
cp Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks.dll
ifndef MCS_MODE
cp Test/resources/TestTasks-$(PROFILE).pdb Test/resources/TestTasks.pdb
TEST_MCS_FLAGS += -resource:Test/resources/TestTasks-$(PROFILE).pdb,Test/resources/TestTasks.pdb
endif
test-local: Test/resources/TestTasks-$(PROFILE).dll
include $(XBUILD_DIR)/xbuild_test.make
include ../../build/library.make

1
mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine_test.dll.sources
View File

@@ -1,3 +1,4 @@
../../test-helpers/TestResourceHelper.cs
Microsoft.Build.BuildEngine/BuildChooseTest.cs
Microsoft.Build.BuildEngine/BuildItemGroupCollectionTest.cs
Microsoft.Build.BuildEngine/BuildItemGroupTest.cs

4
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildItemTest.cs
View File

@@ -31,6 +31,8 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class BuildItemTest {
@@ -919,7 +921,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
public void TestBuildItemTransform ()
{
string projectText = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='BatchingTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='BatchingTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<ItemGroup>
<Foo Include='abc'/>

2
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildPropertyTest.cs
View File

@@ -33,6 +33,8 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class BuildPropertyTest {

10
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildTaskTest.cs
View File

@@ -33,6 +33,8 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class BuildTaskTest {
@@ -321,7 +323,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<UsingTask
AssemblyFile='Test\resources\TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='OutputTestTask'
/>
<Target Name='T'>
@@ -356,7 +358,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<UsingTask
AssemblyFile='Test\resources\TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='NamespacedOutputTestTask'
/>
<Target Name='T'>
@@ -416,7 +418,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<UsingTask
AssemblyFile='Test\resources\TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='OutputTestTask'
/>
<Target Name='T'>
@@ -449,7 +451,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<UsingTask
AssemblyFile='Test\resources\TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='OutputTestTask'
/>
<Target Name='T'>

1
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
View File

@@ -996,6 +996,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
// helper methods for TestGlobalProperties*
void WriteGlobalPropertiesProjects (string mainProject, string firstProject, string secondProject)
{
Directory.CreateDirectory (Path.Combine ("Test", "resources"));
using (StreamWriter sw = new StreamWriter (Path.Combine ("Test", Path.Combine ("resources", "main.proj")))) {
sw.Write (mainProject);
}

16
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ImportCollectionTest.cs
View File

@@ -32,6 +32,8 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class ImportCollectionTest {
@@ -60,8 +62,8 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";
@@ -81,7 +83,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";
@@ -99,7 +101,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";
@@ -117,7 +119,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";
@@ -135,7 +137,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";
@@ -153,7 +155,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";

16
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ImportTest.cs
View File

@@ -33,6 +33,8 @@ using Microsoft.Build.Utilities;
using NUnit.Framework;
using System.IO;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class ImportTest {
@@ -63,7 +65,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test\resources\first.proj'/>
<Import Project='Test\resources\Import.csproj' Condition='false'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"' Condition='false'/>
</Project>
";
@@ -111,7 +113,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/SelfImport.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/SelfImport.csproj") + @"'/>
</Project>
";
@@ -128,7 +130,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/RelativeImport1.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/RelativeImport1.csproj") + @"'/>
</Project>
";
@@ -145,7 +147,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Items.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Items.csproj") + @"'/>
</Project>
";
@@ -167,7 +169,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/NonExistantProject.proj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/NonExistantProject.csproj") + @"'/>
</Project>";
engine = new Engine (Consts.BinPath);
@@ -181,7 +183,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/NonExistantProject.proj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/NonExistantProject.csproj") + @"'/>
</Project>
";
@@ -199,7 +201,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/NonExistantProject.proj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/NonExistantProject.csproj") + @"'/>
</Project>
";

20
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
View File

@@ -40,6 +40,8 @@ using System.Text;
using MBT = MonoTests.Microsoft.Build.Tasks;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
class TestLogger : Logger {
@@ -155,7 +157,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
<PropertyGroup />
<ItemGroup />
<Target Name='a' />
<Import Project='Test/resources/Import.csproj' />
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"' />
</Project>
";
@@ -1055,7 +1057,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<Target Name='T' Inputs='Test\resources\TestTasks.cs' Outputs='Test\resources\TestTasks.dll'>
<Target Name='T' Inputs='A.cs' Outputs='A.dll'>
<Message Text='text' />
</Target>
</Project>
@@ -1306,7 +1308,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
//test for multiple items with same metadata also
string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<ItemGroup>
<Coll1 Include=""A1""><Name>Abc</Name></Coll1>
<Coll1 Include=""A2""><Name>Def</Name></Coll1>
@@ -1346,7 +1348,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
public void TestBatchedMetadataRef2 ()
{
string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<ItemGroup>
<Coll1 Include=""A1""><Name>Abc</Name></Coll1>
<Coll1 Include=""A2""><Name>Def</Name></Coll1>
@@ -1400,7 +1402,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
public void TestBatchedMetadataRef3 ()
{
string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<ItemGroup>
<Coll1 Include=""A1""><Name>Abc</Name></Coll1>
<Coll1 Include=""A2""><Name>Def</Name></Coll1>
@@ -1436,7 +1438,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
public void TestBatchedMetadataRef4 ()
{
string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<ItemGroup>
<Coll1 Include=""A1""><Name>Abc</Name></Coll1>
<Coll1 Include=""A2""><Name>Def</Name></Coll1>
@@ -1465,7 +1467,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
public void TestBatchedMetadataRef5 ()
{
string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<ItemGroup>
<Coll1 Include=""A1""><Name>Abc</Name></Coll1>
<Coll1 Include=""A2""><Name>Def</Name></Coll1>
@@ -1500,7 +1502,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
[Category ("NotDotNet")]
public void TestBatchedMetadataRefInOutput () {
string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""BatchingTestTask"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<ItemGroup>
<Coll1 Include=""A1""><Name>Abc</Name></Coll1>
<Coll1 Include=""A2""><Name>Def</Name></Coll1>
@@ -2265,7 +2267,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string expected_output_msg)
{
string projectString = String.Format (@"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName=""{0}"" AssemblyFile=""Test/resources/TestTasks.dll"" />
<UsingTask TaskName=""{0}"" AssemblyFile=""" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @""" />
<Target Name=""foo"">
<{0} Property=""{1}"">
<Output TaskParameter=""Output"" ItemName=""OutItem""/>

4
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
View File

@@ -36,6 +36,8 @@ using NUnit.Framework;
using System.IO;
using System.Xml;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class TargetTest {
@@ -1038,7 +1040,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
{
engine = new Engine (Consts.BinPath);
project = engine.CreateNewProject ();
project.Load (Path.Combine ("Test", Path.Combine ("resources", "TestReturns.csproj")));
project.Load (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestReturns.csproj"));
var logger = new TestMessageLogger ();
engine.RegisterLogger (logger);

26
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/UsingTaskCollectionTest.cs
View File

@@ -32,6 +32,8 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class UsingTaskCollectionTest {
@@ -45,7 +47,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -67,11 +69,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='FalseTestTask'
/>
</Project>
@@ -84,12 +86,12 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
IEnumerator en = project.UsingTasks.GetEnumerator ();
en.MoveNext ();
Assert.AreEqual ("Test/resources/TestTasks.dll", ((UsingTask) en.Current).AssemblyFile, "A1");
Assert.AreEqual (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll"), ((UsingTask) en.Current).AssemblyFile, "A1");
Assert.AreEqual ("TrueTestTask", ((UsingTask) en.Current).TaskName, "A2");
en.MoveNext ();
Assert.AreEqual ("Test/resources/TestTasks.dll", ((UsingTask) en.Current).AssemblyFile, "A3");
Assert.AreEqual (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll"), ((UsingTask) en.Current).AssemblyFile, "A3");
Assert.AreEqual ("FalseTestTask", ((UsingTask) en.Current).TaskName, "A4");
Assert.IsFalse (en.MoveNext ());
@@ -102,7 +104,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -123,7 +125,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -145,7 +147,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -167,7 +169,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -187,7 +189,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -207,7 +209,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>
@@ -230,7 +232,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
</Project>

26
mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/UsingTaskTest.cs
View File

@@ -32,6 +32,8 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine {
[TestFixture]
public class UsingTaskTest {
@@ -45,7 +47,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='SimpleTask'
Condition='true'
/>
@@ -61,7 +63,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
UsingTask ut = (UsingTask) en.Current;
Assert.AreEqual ("Test/resources/TestTasks.dll", ut.AssemblyFile, "A1");
Assert.AreEqual (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll"), ut.AssemblyFile, "A1");
Assert.IsNull (ut.AssemblyName, "A2");
Assert.AreEqual ("true", ut.Condition, "A3");
Assert.AreEqual (false, ut.IsImported, "A4");
@@ -74,7 +76,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='SimpleTask'
/>
</Project>
@@ -89,7 +91,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
UsingTask ut = (UsingTask) en.Current;
Assert.AreEqual ("Test/resources/TestTasks.dll", ut.AssemblyFile, "A1");
Assert.AreEqual (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll"), ut.AssemblyFile, "A1");
Assert.IsNull (ut.AssemblyName, "A2");
Assert.AreEqual (null, ut.Condition, "A3");
Assert.AreEqual (false, ut.IsImported, "A4");
@@ -133,7 +135,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
/>
</Project>
";
@@ -208,11 +210,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='TrueTestTask'
/>
@@ -238,7 +240,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
Assert.AreEqual (2, project.UsingTasks.Count, "A0");
foreach (UsingTask ut in project.UsingTasks) {
Assert.AreEqual ("Test/resources/TestTasks.dll", ut.AssemblyFile, "A1");
Assert.AreEqual (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll"), ut.AssemblyFile, "A1");
Assert.IsNull (ut.AssemblyName, "A2");
Assert.AreEqual (null, ut.Condition, "A3");
Assert.AreEqual (false, ut.IsImported, "A4");
@@ -301,11 +303,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='Another.SameTask'
/>
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='Other.SameTask'
/>
@@ -343,7 +345,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask
AssemblyFile='Test/resources/TestTasks.dll'
AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"'
TaskName='Another.SameTask'
Condition='false'
/>
@@ -367,7 +369,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
UsingTask ut = (UsingTask) en.Current;
Assert.AreEqual ("Test/resources/TestTasks.dll", ut.AssemblyFile, "A1");
Assert.AreEqual (TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll"), ut.AssemblyFile, "A1");
Assert.IsNull (ut.AssemblyName, "A2");
Assert.AreEqual ("false", ut.Condition, "A3");
Assert.AreEqual (false, ut.IsImported, "A4");

4
mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
View File

@@ -31,6 +31,8 @@ using System.Xml;
using Microsoft.Build.BuildEngine;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine.Various {
[TestFixture]
public class Conditions {
@@ -297,7 +299,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
<B Condition="" 'on' == 'true' ""></B>
<C Condition="" 4 == 4.0 and 04 == 4""></C>
<D Condition="" !(false and false) == !false or !false ""></D>
<E Condition="" Exists ('Test\resources\Import.csproj') ""></E>
<E Condition="" Exists ('" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"') ""></E>
</PropertyGroup>
</Project>
";

18
mcs/class/Microsoft.Build.Engine/Test/various/EvaluationOrder.cs
View File

@@ -30,6 +30,8 @@ using System.Xml;
using Microsoft.Build.BuildEngine;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine.Various {
[TestFixture]
public class EvaluationOrder {
@@ -242,7 +244,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<PropertyGroup>
<Property>Test/resources/Import.csproj</Property>
<Property>" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"</Property>
</PropertyGroup>
<Import Project='$(Property)'/>
@@ -268,7 +270,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
<Import Project='$(Property)'/>
<PropertyGroup>
<Property>Test/resources/Import.csproj</Property>
<Property>" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"</Property>
</PropertyGroup>
</Project>
";
@@ -290,7 +292,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<ItemGroup>
<Item Include='Test/resources/Import.csproj' />
<Item Include='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"' />
</ItemGroup>
<Import Project='@(Item)'/>
@@ -316,7 +318,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
<Import Project='@(Item)'/>
<ItemGroup>
<Item Include='Test/resources/Import.csproj' />
<Item Include='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"' />
</ItemGroup>
</Project>
";
@@ -340,7 +342,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
<ImportedProperty>AnotherValue</ImportedProperty>
</PropertyGroup>
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
</Project>
";
@@ -359,7 +361,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
<PropertyGroup>
<ImportedProperty>AnotherValue</ImportedProperty>
@@ -382,7 +384,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<Import Project='Test/resources/Import.csproj'/>
<Import Project='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/Import.csproj") + @"'/>
<PropertyGroup>
<ImportedProperty>Another$(ImportedProperty)</ImportedProperty>
@@ -405,7 +407,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<PropertyGroup>
<Property>Test\resources\TestTasks.dll</Property>
<Property>" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"</Property>
</PropertyGroup>
<UsingTask AssemblyFile='$(Property)' TaskName='TrueTestTask' />

30
mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
View File

@@ -35,6 +35,8 @@ using NUnit.Framework;
using System.IO;
using Microsoft.Build.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine.Various {
[TestFixture]
public class Items {
@@ -722,9 +724,9 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
public void TestEmptyItemsWithBatching ()
{
string project_xml = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='TestTask_TaskItem' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='TestTask_TaskItems' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<UsingTask TaskName='TestTask_TaskItem' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<UsingTask TaskName='TestTask_TaskItems' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<Target Name=""1"">
<StringTestTask Property=""%(Item4.Identity)"">
<Output TaskParameter=""OutputString"" PropertyName=""OutputString""/>
@@ -808,7 +810,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>@(A)g</B>
@@ -875,7 +877,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<ItemGroup>
<A Include='A;B;C' />
</ItemGroup>
@@ -901,7 +903,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>A;B</B>
@@ -946,7 +948,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='BatchingTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='BatchingTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>A;B</B>
@@ -995,7 +997,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='BatchingTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='BatchingTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>A;B</B>
@@ -1041,7 +1043,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='BatchingTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='BatchingTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>A;B</B>
@@ -1192,7 +1194,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
{
return @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='BatchingTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='BatchingTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>A;B</B>
@@ -1236,7 +1238,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<ItemGroup>
<A Include='A;B;C' />
</ItemGroup>
@@ -1260,7 +1262,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<ItemGroup>
<A Include='A;B;C' />
</ItemGroup>
@@ -1284,7 +1286,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<ItemGroup>
<A Include='A;B;C' />
</ItemGroup>
@@ -1311,7 +1313,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='BatchingTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='BatchingTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<ItemGroup>
<A Include='A;B;C' />
<B Include='Foo;' />

4
mcs/class/Microsoft.Build.Engine/Test/various/Properties.cs
View File

@@ -31,6 +31,8 @@ using System.Xml;
using Microsoft.Build.BuildEngine;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.Microsoft.Build.BuildEngine.Various {
[TestFixture]
public class Properties {
@@ -72,7 +74,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
{
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<UsingTask TaskName='StringTestTask' AssemblyFile='Test\resources\TestTasks.dll' />
<UsingTask TaskName='StringTestTask' AssemblyFile='" + TestResourceHelper.GetFullPathOfResource ("Test/resources/TestTasks.dll") + @"' />
<PropertyGroup>
<A>A</A>
<B>B</B>