From 2d8d854867cd69d014754ff3291c7d263b9168f1 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 9 Jun 2023 09:34:25 +0200
Subject: [PATCH] PR feedback.

---
 .../test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs | 4 ----
 ...DuplicateFiles.cs => RemoveDuplicateFilesWithHardLinks.cs} | 4 ++--
 src/redist/targets/BuildCoreSdkTasks.targets                  | 2 +-
 src/redist/targets/GenerateLayout.targets                     | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)
 rename src/core-sdk-tasks/{RemoveDuplicateFiles.cs => RemoveDuplicateFilesWithHardLinks.cs} (97%)

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
index 6bdee2402..e73a29939 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
@@ -21,10 +21,6 @@ public static class Utilities
         // TarFile doesn't properly handle hard links (https://github.com/dotnet/runtime/pull/85378#discussion_r1221817490),
         // use 'tar' instead.
         ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {tarballPath} -C {outputDir}", outputHelper);
-
-        // using FileStream fileStream = File.OpenRead(tarballPath);
-        // using GZipStream decompressorStream = new(fileStream, CompressionMode.Decompress);
-        // TarFile.ExtractToDirectory(decompressorStream, outputDir, true);
     }
 
     public static void ExtractTarball(string tarballPath, string outputDir, string targetFilePath)
diff --git a/src/core-sdk-tasks/RemoveDuplicateFiles.cs b/src/core-sdk-tasks/RemoveDuplicateFilesWithHardLinks.cs
similarity index 97%
rename from src/core-sdk-tasks/RemoveDuplicateFiles.cs
rename to src/core-sdk-tasks/RemoveDuplicateFilesWithHardLinks.cs
index aa280d975..076828de5 100644
--- a/src/core-sdk-tasks/RemoveDuplicateFiles.cs
+++ b/src/core-sdk-tasks/RemoveDuplicateFilesWithHardLinks.cs
@@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Build.Tasks
     /// <summary>
     /// Replaces files that have the same content with hard links.
     /// </summary>
-    public sealed class RemoveDuplicateFiles  : Task
+    public sealed class RemoveDuplicateFilesWithHardLinks  : Task
     {
         /// <summary>
         /// The path to the directory.
@@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Build.Tasks
         {
             if (OperatingSystem.IsWindows())
             {
-                Log.LogError($"{nameof(RemoveDuplicateFiles)} is not supported on Windows.");
+                Log.LogError($"{nameof(RemoveDuplicateFilesWithHardLinks)} is not supported on Windows.");
                 return false;
             }
 
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
index cd53c8b40..7cf28ecdb 100644
--- a/src/redist/targets/BuildCoreSdkTasks.targets
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -40,6 +40,6 @@
   <UsingTask TaskName="CollatePackageDownloads" AssemblyFile="$(CoreSdkTaskDll)"/>
   <UsingTask TaskName="GenerateSdkRuntimeIdentifierChain" AssemblyFile="$(CoreSdkTaskDll)"/>
   <UsingTask TaskName="GetDependencyInfo" AssemblyFile="$(CoreSdkTaskDll)"/>
-  <UsingTask TaskName="RemoveDuplicateFiles" AssemblyFile="$(CoreSdkTaskDll)"/>
+  <UsingTask TaskName="RemoveDuplicateFilesWithHardLinks" AssemblyFile="$(CoreSdkTaskDll)"/>
 
 </Project>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 2a52da819..e6923ed03 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -568,7 +568,7 @@
        and the corresponding shared frameworks are included in a distro package their data is shared instead of duplicated. -->
   <Target Name="ReplaceDuplicateFilesWithHardLinks" DependsOnTargets="LayoutBundledComponents"
                                                     Condition="'$(BundleRuntimePacks)' == 'true' and  !$([MSBuild]::IsOSPlatform('WINDOWS'))">
-    <RemoveDuplicateFiles Directory="$(RedistLayoutPath)" />
+    <RemoveDuplicateFilesWithHardLinks Directory="$(RedistLayoutPath)" />
   </Target>
 
   <Target Name="GenerateLayout"