From 0eea7e057935d2bc99be27e824138d65f511b2ed Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:29:22 -0800
Subject: [PATCH] Fix stack overflow and rename method

---
 src/SourceBuild/content/eng/build.targets                     | 2 +-
 .../GetClosestOfficialSdk.cs                                  | 4 ++--
 .../PathWithVersions.cs                                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets
index c10d8c12e..630307028 100644
--- a/src/SourceBuild/content/eng/build.targets
+++ b/src/SourceBuild/content/eng/build.targets
@@ -16,7 +16,7 @@
         <Output TaskParameter="ContentDifferences" ItemName="ContentDifferences" />
       </FindArchiveDiffs>
 
-      <Message Text="Difference in sdk archive: %(ContentDifferences.Kind): %(ContentDifferences.Identity)" Importance="High" Condition="'%(ContentDifferences.Kind)' != 'Unchanged'"/>
+      <Message Text="Difference in sdk archive: %(ContentDifferences.Kind): %(ContentDifferences.Identity)" Importance="High" Condition="'%(ContentDifferences.Identity)' != '' AND '%(ContentDifferences.Kind)' != 'Unchanged'"/>
       <Delete Files="$(ClosestOfficialSdkPath)" Condition="'$(ClosestOfficialSdkPath)' == ''"/>
 
   </Target>
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs
index 6f130c100..708bea6d6 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs
@@ -24,7 +24,7 @@ public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task
 
     public async Task<bool> ExecuteAsync()
     {
-        var (versionString, rid, extension) = ExtractFromFilePath(BuiltSdkPath);
+        var (versionString, rid, extension) = GetInfoFromArchivePath(BuiltSdkPath);
 
         string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension);
 
@@ -63,7 +63,7 @@ public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task
         return $"https://aka.ms/dotnet/{channel}/daily/dotnet-sdk-{rid}{extension}";
     }
 
-    static (string Version, string Rid, string extension) ExtractFromFilePath(string path)
+    static (string Version, string Rid, string extension) GetInfoFromArchivePath(string path)
     {
         string extension;
         if (path.EndsWith(".tar.gz"))
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs
index 2d3eb29c3..6baf40e86 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs
@@ -73,7 +73,7 @@ public static class PathWithVersions
 
     public static string GetVersionAnonymousPath(string path)
     {
-        return GetVersionAnonymousPath(path).ToString();
+        return GetVersionAnonymousPath(path.AsSpan()).ToString();
     }
 
     public static ReadOnlySpan<char> GetVersionAnonymousPath(ReadOnlySpan<char> path)