[MS.Build] ProjectOnErrorInstance should not cause build failure.

gerum · Jun 2, 2014 · 8498e0d · 8498e0d
1 parent c29ae4c
commit 8498e0d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/BuildEngine4.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/BuildEngine4.cs
@@ -285,6 +285,10 @@ bool DoBuildTarget (ProjectTargetInstance target, TargetResult targetResult, Int
 						continue;
 					}
 
+					var onError = child as ProjectOnErrorInstance;
+					if (onError != null)
+						continue; // evaluated under catch clause.
+
 					throw new NotSupportedException (string.Format ("Unexpected Target element children \"{0}\"", child.GetType ()));
 				}
 			} catch (Exception ex) {