Addressing few review comments

NikolaMilosavljevic · NikolaMilosavljevic · commit 9fe1ae4d009b · 2024-12-18T11:11:21.000-08:00
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/ArWriter.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/ArWriter.cs
@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.DotNet.Build.Tasks.Installers.src
+namespace Microsoft.DotNet.Build.Tasks.Installers
 {
     internal sealed class ArWriter : IDisposable
     {
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateDebPackage.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateDebPackage.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using Microsoft.Build.Framework;
 
-namespace Microsoft.DotNet.Build.Tasks.Installers.src
+namespace Microsoft.DotNet.Build.Tasks.Installers
 {
     /// <summary>
     /// Create a .deb package from a control file and a data file.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateLightCommandPackageDrop.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateLightCommandPackageDrop.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Build.Framework;
-using Microsoft.DotNet.Build.Tasks.Installers.src;
 using System.IO;
 using System.Text;
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateRpmPackage.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateRpmPackage.cs
@@ -9,7 +9,7 @@
 using System.Text;
 using Microsoft.Build.Framework;
 
-namespace Microsoft.DotNet.Build.Tasks.Installers.src
+namespace Microsoft.DotNet.Build.Tasks.Installers
 {
     /// <summary>
     /// Create a .deb package from a control file and a data file.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateWixCommandPackageDropBase.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateWixCommandPackageDropBase.cs
@@ -11,7 +11,7 @@
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace Microsoft.DotNet.Build.Tasks.Installers.src
+namespace Microsoft.DotNet.Build.Tasks.Installers
 {
     public abstract class CreateWixCommandPackageDropBase : BuildTask
     {
diff --git a/src/Microsoft.DotNet.SignTool/src/ZipData.cs b/src/Microsoft.DotNet.SignTool/src/ZipData.cs
@@ -12,7 +12,6 @@
 using System.Data;
 using System.Diagnostics;
 using Microsoft.DotNet.Build.Tasks.Installers;
-using Microsoft.DotNet.Build.Tasks.Installers.src;
 
 #if NET472
 using System.IO.Packaging;
@@ -397,7 +396,7 @@ private static IEnumerable<TarEntry> ReadTarGZipEntries(string path)
         private void RepackDebContainer(TaskLoggingHelper log, string tempDir)
         {
             // Data archive is the only expected nested part
-            string dataArchive = NestedParts.Values.First().FileSignInfo.FullPath;
+            string dataArchive = NestedParts.Values.Single().FileSignInfo.FullPath;
 
             string controlArchive;
             try
@@ -444,7 +443,7 @@ private string GetUpdatedControlArchive(string debianPackage, string dataArchive
             Directory.CreateDirectory(dataLayout);
 
             // Get the original control archive - to reuse package metadata and scripts
-            var (relativePath, content, contentSize) = ReadDebContainerEntries(debianPackage, "control.tar").First();
+            var (relativePath, content, contentSize) = ReadDebContainerEntries(debianPackage, "control.tar").Single();
             string controlArchive = Path.Combine(workingDir, relativePath);
             File.WriteAllBytes(controlArchive, ((MemoryStream)content).ToArray());
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System.Text;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`
`11`		`-namespace Microsoft.DotNet.Build.Tasks.Installers.src`
	`11`	`+namespace Microsoft.DotNet.Build.Tasks.Installers`
`12`	`12`	`{`
`13`	`13`	`internal sealed class ArWriter : IDisposable`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Text;`
`7`	`7`	`using Microsoft.Build.Framework;`
`8`	`8`
`9`		`-namespace Microsoft.DotNet.Build.Tasks.Installers.src`
	`9`	`+namespace Microsoft.DotNet.Build.Tasks.Installers`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Create a .deb package from a control file and a data file.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using System.Text;`
`10`	`10`	`using Microsoft.Build.Framework;`
`11`	`11`
`12`		`-namespace Microsoft.DotNet.Build.Tasks.Installers.src`
	`12`	`+namespace Microsoft.DotNet.Build.Tasks.Installers`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Create a .deb package from a control file and a data file.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`using System.Xml.Linq;`
`12`	`12`	`using System.Xml.XPath;`
`13`	`13`
`14`		`-namespace Microsoft.DotNet.Build.Tasks.Installers.src`
	`14`	`+namespace Microsoft.DotNet.Build.Tasks.Installers`
`15`	`15`	`{`
`16`	`16`	`public abstract class CreateWixCommandPackageDropBase : BuildTask`
`17`	`17`	`{`