From 09a29e53082629744325decace0d1be0d95347fc Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Fri, 10 Sep 2021 07:54:47 -0500
Subject: [PATCH] Ensure ci option is specified in tarball builds (#11956)

---
 .../ArcadeOverrides/SourceBuildArcadeBuild.targets   |  2 ++
 .../tarball/content/repos/Directory.Build.targets    | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets
index d48d9112c..eeea55fcc 100644
--- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets
+++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets
@@ -78,6 +78,8 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:ArtifactsDir=$(CurrentRepoSourceBuildArtifactsDir)</InnerBuildArgs>
       <!-- Set a custom binlog location to avoid clashing over the currenly specified file. -->
       <InnerBuildArgs>$(InnerBuildArgs) /bl:$(CurrentRepoSourceBuildBinlogFile)</InnerBuildArgs>
+      <!-- Flow ContinuousIntegrationBuild to the inner build. -->
+      <InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=true</InnerBuildArgs>
 
       <!-- The inner build needs to reference the overall output dir for nupkg transport etc. -->
       <InnerBuildArgs>$(InnerBuildArgs) /p:SourceBuildOutputDir=$(SourceBuildOutputDir)</InnerBuildArgs>
diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
index a1ec9e22d..046a371d9 100644
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
@@ -162,11 +162,9 @@
       This adds additional scenarios when modifying tools.sh to search for the logger_path.  Source-build
       builds arcade after the change, so the logger is no longer found in Microsoft.DotNet.Arcade.Sdk,
       rather, it has moved to Microsoft.DotNet.ArcadeLogging.
-      The scenarios are:
-
-        1. Repo has old tools.sh - replace with new search for logger_path from updated tools.sh which looks for ArcadeLogging first,
+      The scenarios are: -->
+     <!-- 1. Repo has old tools.sh - replace with new search for logger_path from updated tools.sh which looks for ArcadeLogging first,
           but make the source-build search changes to find the right dll. -->
-
     <ReplaceTextInFile InputFile="$(EngCommonToolsShFile)"
                        OldText="local logger_path=&quot;$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll&quot;"
                        NewText="$(LoggerPathReplacementText)" />
@@ -182,6 +180,12 @@
                        OldText="_InitializeBuildToolFramework=&quot;netcoreapp3.1&quot;"
                        NewText="_InitializeBuildToolFramework=&quot;%24{_OverrideArcadeInitializeBuildToolFramework-netcoreapp3.1}&quot;" />
 
+    <!-- Temporary workaround for when the ci option is specified, non-zero exit are swallowed which prevents builds from failing within 
+         the tarball build preocess.  https://github.com/dotnet/source-build/issues/2307 -->
+    <ReplaceTextInFile InputFile="$(EngCommonToolsShFile)"
+                       OldText="ExitWithExitCode 0"
+                       NewText="ExitWithExitCode $exit_code" />
+
     <WriteLinesToFile File="$(RepoCompletedSemaphorePath)UpdateBuildToolFramework.complete" Overwrite="true" />
   </Target>