From 97fc3b83423bf37256f02763bbd1f846f9ff383a Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:41:32 -0800
Subject: [PATCH] PR Feedback: Formatting, move/add conditions, output diffs to
 csv in logs

---
 src/SourceBuild/content/build.proj                |  3 ++-
 .../{build.targets => sdkArchiveDiffs.targets}    | 15 +++++++++------
 src/SourceBuild/content/eng/tools/init-build.proj |  3 ++-
 3 files changed, 13 insertions(+), 8 deletions(-)
 rename src/SourceBuild/content/eng/{build.targets => sdkArchiveDiffs.targets} (82%)

diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj
index adc0a15bb..d18fb9a50 100644
--- a/src/SourceBuild/content/build.proj
+++ b/src/SourceBuild/content/build.proj
@@ -20,6 +20,7 @@
   </Target>
 
   <Import Project="$(RepositoryEngineeringDir)build.sourcebuild.targets" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-  <Import Project="$(RepositoryEngineeringDir)build.targets" />
+  <!-- ShortStack doesn't produce an SDK, and GetClosestOfficialSdk doesn't support finding non-portable SDKs -->
+  <Import Project="$(RepositoryEngineeringDir)sdkArchiveDiff.targets" Condition="'$(ShortStack)' != 'true' and '$(PortableBuild)' == 'true'" />
 
 </Project>
diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/sdkArchiveDiffs.targets
similarity index 82%
rename from src/SourceBuild/content/eng/build.targets
rename to src/SourceBuild/content/eng/sdkArchiveDiffs.targets
index 008c7c2ad..c80f6a245 100644
--- a/src/SourceBuild/content/eng/build.targets
+++ b/src/SourceBuild/content/eng/sdkArchiveDiffs.targets
@@ -1,13 +1,12 @@
 <Project>
+
   <UsingTask AssemblyFile="$(SdkArchiveDiffTasksAssembly)" TaskName="GetValidArchiveItems" />
   <UsingTask AssemblyFile="$(SdkArchiveDiffTasksAssembly)" TaskName="GetClosestOfficialSdk" />
   <UsingTask AssemblyFile="$(SdkArchiveDiffTasksAssembly)" TaskName="FindArchiveDiffs" />
 
   <Target Name="ReportSdkArchiveDiffs"
           AfterTargets="Build"
-          DependsOnTargets="DetermineSourceBuiltSdkVersion"
-          Condition="'$(ShortStack)' != 'true' AND '$(PortableBuild)' == 'true'" >
-          <!-- ShortStack doesn't produce an SDK, and GetClosestOfficialSdk doesn't support finding non-portable SDKs -->
+          DependsOnTargets="DetermineSourceBuiltSdkVersion">
 
       <Message Text="Comparing built SDK against closest official build"
                Importance="High"/>
@@ -37,6 +36,12 @@
         <_changedFiles Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' != 'Unchanged'" />
       </ItemGroup>
 
+      <PropertyGroup>
+        <SdkArchiveDiffsReport>$(ArtifactsLogDir)\SdkArchiveDiffs\SdkArchiveDiffs.csv</SdkArchiveDiffsReport>
+      </PropertyGroup>
+
+      <WriteLinesToFile File="$(SdkArchiveDiffsReport)" Lines="%(_ContentDifference.Kind), %(_ContentDifferences.Identity)" />
+
       <Message Text="Difference in sdk archive: %(_changedFiles.Kind): %(_changedFiles.Identity)"
                Importance="High"
                Condition="'@(_changedFiles->Count())' != '0'"/>
@@ -44,9 +49,7 @@
                Importance="High"
                Condition="'@(_changedFiles->Count())' == '0'" />
 
-      <Delete Files="$(_ClosestOfficialSdkPath)"
-              Condition="'$(_ClosestOfficialSdkPath)' == ''"/>
-
+      <Delete Files="$(_ClosestOfficialSdkPath)" />
   </Target>
 
 </Project>
diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj
index 95b453113..a196b48cf 100644
--- a/src/SourceBuild/content/eng/tools/init-build.proj
+++ b/src/SourceBuild/content/eng/tools/init-build.proj
@@ -117,7 +117,8 @@
     </Touch>
   </Target>
 
-  <Target Name="BuildSdkArchiveDiff" >
+  <Target Name="BuildSdkArchiveDiff"
+          Condition="'$(ShortStack)' != 'true' and '$(PortableBuild)' == 'true'" >
     <MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff\Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj"
              Targets="Restore"
              Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />