From dd78feb38fc8e2fdef61aeeeecbd3f6b5a9cf1b2 Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Wed, 16 Sep 2026 17:33:23 -0700
Subject: [PATCH 1/3] Add ContinueOnError support for DispatchToInnerBuilds
 target

---
 .../CrossTargetingTsrgets_Tests.cs            | 79 +++++++++++++++++++
 .../Microsoft.Common.CrossTargeting.targets   |  9 ++-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs

diff --git a/src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs b/src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs
new file mode 100644
index 00000000000..1ce644f36d9
--- /dev/null
+++ b/src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs
@@ -0,0 +1,79 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using Microsoft.Build.UnitTests;
+using Xunit;
+
+namespace Microsoft.Build.UnitTests
+{
+    public class CrossTargetingTargetsTests
+    {
+        private readonly ITestOutputHelper _output;
+
+        public CrossTargetingTargetsTests(ITestOutputHelper output)
+        {
+            _output = output;
+        }
+
+        [Theory]
+        [InlineData("WarnAndContinue", true, true)]
+        [InlineData("true", true, true)]
+        [InlineData("ErrorAndContinue", false, true)]
+        [InlineData("ErrorAndStop ", false, false)]
+        [InlineData("false", false, false)]
+        [InlineData(null, false, false)]
+        public void DispatchToInnerBuildsCanContinueOnError(string? continueOnError, bool expectSuccess, bool expectAfterDispatch)
+        {
+            using TestEnvironment env = TestEnvironment.Create(_output);
+            TransientTestFile nugetTargets = env.CreateFile("NuGet.targets", "<Project />");
+
+            TransientTestProjectWithFiles project = env.CreateTestProjectWithFiles("""
+                <Project DefaultTargets="Test">
+                <PropertyGroup>
+                    <TargetFrameworks>failing;successful</TargetFrameworks>
+                    <InnerTargets>InnerBuild</InnerTargets>
+                    <BuildInParallel>false</BuildInParallel>
+                </PropertyGroup>
+
+                <Import Project="$(MSBuildToolsPath)\Microsoft.Common.CrossTargeting.targets" />
+
+                <Target Name="InnerBuild">
+                    <Error
+                    Condition="'$(TargetFramework)' == 'failing'"
+                    Text="INNER_FAILURE" />
+                </Target>
+
+                <Target Name="Test" DependsOnTargets="DispatchToInnerBuilds">
+                    <Message Text="AFTER_DISPATCH" Importance="High" />
+                </Target>
+                </Project>
+                """);
+
+            var globalProperties = new Dictionary<string, string>
+            {
+                ["NuGetRestoreTargets"] = nugetTargets.Path,
+            };
+
+            if (continueOnError is not null)
+            {
+                globalProperties["DispatchToInnerBuildsContinueOnError"] = continueOnError;
+            }
+
+            MockLogger logger = expectSuccess
+                ? project.BuildProjectExpectSuccess(globalProperties)
+                : project.BuildProjectExpectFailure(globalProperties);
+
+            logger.AssertLogContains("INNER_FAILURE");
+
+            if (expectAfterDispatch)
+            {
+                logger.AssertLogContains("AFTER_DISPATCH");
+            }
+            else
+            {
+                logger.AssertLogDoesntContain("AFTER_DISPATCH");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Tasks/Microsoft.Common.CrossTargeting.targets b/src/Tasks/Microsoft.Common.CrossTargeting.targets
index 1c9d0c555b1..7018a9fee38 100644
--- a/src/Tasks/Microsoft.Common.CrossTargeting.targets
+++ b/src/Tasks/Microsoft.Common.CrossTargeting.targets
@@ -121,7 +121,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
      @(InnerOutput) - The combined output items of the inner targets across
                       all target frameworks..
   ============================================================
-  -->
+  -->    
   <Target Name="DispatchToInnerBuilds"
           DependsOnTargets="_ComputeTargetFrameworkItems"
           Returns="@(InnerOutput)">
@@ -129,11 +129,16 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <MSBuild Projects="@(_InnerBuildProjects)"
              Condition="'@(_InnerBuildProjects)' != '' "
              Targets="$(InnerTargets)"
-             BuildInParallel="$(BuildInParallel)">
+             BuildInParallel="$(BuildInParallel)"
+             ContinueOnError="$(DispatchToInnerBuildsContinueOnError)">
       <Output ItemName="InnerOutput" TaskParameter="TargetOutputs" />
     </MSBuild>
   </Target>
 
+  <PropertyGroup>
+    <DispatchToInnerBuildsContinueOnError Condition="'$(DispatchToInnerBuildsContinueOnError)' == ''">false</DispatchToInnerBuildsContinueOnError>
+  </PropertyGroup>
+    
   <!--
   ============================================================
                                        Build

From 247e409ff2afef11475868348224d0f7d15674dc Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Thu, 17 Sep 2026 10:57:40 -0700
Subject: [PATCH 2/3] Fix test

---
 ...TargetingTsrgets_Tests.cs => CrossTargetingTargets_Tests.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/Build.UnitTests/{CrossTargetingTsrgets_Tests.cs => CrossTargetingTargets_Tests.cs} (98%)

diff --git a/src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs b/src/Build.UnitTests/CrossTargetingTargets_Tests.cs
similarity index 98%
rename from src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs
rename to src/Build.UnitTests/CrossTargetingTargets_Tests.cs
index 1ce644f36d9..3cba8e2315f 100644
--- a/src/Build.UnitTests/CrossTargetingTsrgets_Tests.cs
+++ b/src/Build.UnitTests/CrossTargetingTargets_Tests.cs
@@ -20,7 +20,7 @@ public CrossTargetingTargetsTests(ITestOutputHelper output)
         [InlineData("WarnAndContinue", true, true)]
         [InlineData("true", true, true)]
         [InlineData("ErrorAndContinue", false, true)]
-        [InlineData("ErrorAndStop ", false, false)]
+        [InlineData("ErrorAndStop", false, false)]
         [InlineData("false", false, false)]
         [InlineData(null, false, false)]
         public void DispatchToInnerBuildsCanContinueOnError(string? continueOnError, bool expectSuccess, bool expectAfterDispatch)

From 41a16b3dd2d32c40d1f5bfe37e67a436799f9930 Mon Sep 17 00:00:00 2001
From: Gen Lu <genlu@users.noreply.github.com>
Date: Wed, 30 Sep 2026 14:39:03 -0700
Subject: [PATCH 3/3] Fix formatting in Microsoft.Common.CrossTargeting.targets

---
 src/Tasks/Microsoft.Common.CrossTargeting.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.Common.CrossTargeting.targets b/src/Tasks/Microsoft.Common.CrossTargeting.targets
index 7018a9fee38..975435ee78a 100644
--- a/src/Tasks/Microsoft.Common.CrossTargeting.targets
+++ b/src/Tasks/Microsoft.Common.CrossTargeting.targets
@@ -121,7 +121,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
      @(InnerOutput) - The combined output items of the inner targets across
                       all target frameworks..
   ============================================================
-  -->    
+  -->
   <Target Name="DispatchToInnerBuilds"
           DependsOnTargets="_ComputeTargetFrameworkItems"
           Returns="@(InnerOutput)">