X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Engine%2FTest%2FMicrosoft.Build.BuildEngine%2FTargetTest.cs;h=d36ae158701c0db1fa8a9243e154b77e399d63bd;hb=9572e2a3e3c255d96ddc4a16b7f8819227b8ba5e;hp=d5750ef2ce3394e31018916367bb45f73f1eed3c;hpb=0b4bc83e79ca3057693089dc7f926004bb9d9592;p=mono.git

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
index d5750ef2ce3..d36ae158701 100644
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
@@ -40,6 +40,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 	[TestFixture]
 	public class TargetTest {
 		
+		static bool isMono = Type.GetType ("Mono.Runtime", false) != null;
 		Engine			engine;
 		Project			project;
 		
@@ -284,6 +285,51 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			t [0].RemoveTask (null);
 		}
 
+		[Test]
+		public void TestRunTargetTwice ()
+		{
+			string documentString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+			<Target Name=""Foo"">
+				<Message Text=""Foo ran""/>
+			</Target>
+			<Target Name=""Main"">
+				<MSBuild Projects=""$(MSBuildProjectFile)"" Targets=""Foo;Foo"" />
+			</Target>
+
+		</Project>";
+
+			var filepath = Path.GetTempFileName ();
+			try {
+				File.WriteAllText (filepath, documentString);
+
+				var engine = new Engine (Consts.BinPath);
+				var project = engine.CreateNewProject ();
+				project.Load (filepath);
+
+				var logger = new TestMessageLogger ();
+				engine.RegisterLogger (logger);
+
+				var result = project.Build ("Main");
+				if (!result) {
+					logger.DumpMessages ();
+					Assert.Fail ("Build failed, see the logs");
+				}
+
+				Assert.AreEqual(1, logger.NormalMessageCount, "Expected number of messages");
+				logger.CheckLoggedMessageHead ("Foo ran", "A1");
+
+				Assert.AreEqual(0, logger.NormalMessageCount, "Extra messages found");
+				Assert.AreEqual(0, logger.WarningMessageCount, "Extra warning messages found");
+
+				Assert.AreEqual(2, logger.TargetStarted, "TargetStarted count");
+				Assert.AreEqual(2, logger.TargetFinished, "TargetFinished count");
+
+				Assert.IsTrue (result);
+			} finally {
+				File.Delete (filepath);
+			}
+		}
+
 		[Test]
 		public void TestTargetOutputs1 ()
 		{
@@ -351,16 +397,16 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 
 		bool Build (string projectXml, ILogger logger)
 		{
-			if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+			if (!isMono) {
 				var reader = new StringReader (projectXml);
 				var xml = XmlReader.Create (reader);
-				return BuildOnWindows (xml, logger);
+				return BuildOnDotNet (xml, logger);
 			} else {
-				return BuildOnLinux (projectXml, logger);
+				return BuildOnMono (projectXml, logger);
 			}
 		}
 
-		bool BuildOnWindows (XmlReader reader, ILogger logger)
+		bool BuildOnDotNet (XmlReader reader, ILogger logger)
 		{
 			var type = Type.GetType ("Microsoft.Build.Evaluation.ProjectCollection, Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
 
@@ -376,7 +422,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			return ret;
 		}
 
-		bool BuildOnLinux (string projectXml, ILogger logger)
+		bool BuildOnMono (string projectXml, ILogger logger)
 		{
 			var engine = new Engine (Consts.BinPath);
 			var project = engine.CreateNewProject ();
@@ -697,6 +743,33 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 				</Project>", "D");
 		}
 
+		[Test]
+		public void ItemGroupInsideTarget_UpdateMetadata ()
+		{
+			ItemGroupInsideTarget (
+				@"<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+					<ItemGroup>
+						<ProjectReference Include='xyz'/>
+					</ItemGroup>
+
+					<Target Name='Main' DependsOnTargets='CreateBar'>
+						<Message Text='Before: $(Bar)'/>
+						<ItemGroup>
+							<ProjectReference>
+								<AdditionalProperties>A=b</AdditionalProperties>
+							</ProjectReference>
+						</ItemGroup>
+						<Message Text='After: $(Bar)'/>
+					</Target>
+
+					<Target Name='CreateBar'>
+						<PropertyGroup>
+							<Bar>Bar01</Bar>
+						</PropertyGroup>
+					</Target>
+				</Project>", 2, "Before: Bar01", "After: Bar01");
+		}
+
 		[Test]
 		public void ItemGroupInsideTarget_Batching ()
 		{
@@ -905,7 +978,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			Assert.AreEqual (0, logger.NormalMessageCount, "Unexpected extra messages found");
 		}
 
-#if NET_4_0
 		[Test]
 		[Category ("NotDotNet")]
 		public void TestBeforeAndAfterTargets ()
@@ -960,7 +1032,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			//warnings for referencing unknown targets: NonExistant and Foo
 			Assert.AreEqual (2, logger.WarningsCount, "Expected warnings not raised");
 		}
-#endif
 
 		[Test]
 		public void TestTargetReturns ()