Move some files to LibHac.Common

src/LibHac/Common/HorizonResultException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 public class HorizonResultException : LibHacException
 {

src/LibHac/Common/IProgressReport.cs

@@ -1,4 +1,4 @@
-namespace LibHac;
+namespace LibHac.Common;
 
 public interface IProgressReport
 {

src/LibHac/Common/LibHacException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 /// <summary>
 /// This is the exception that is thrown when an error occurs 

src/LibHac/Common/ProgressBar.cs

@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 public class ProgressBar : IDisposable, IProgressReport
 {

src/LibHac/Common/ThrowHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 internal static class ThrowHelper
 {

src/LibHac/Common/Utilities.cs

@@ -4,7 +4,7 @@ using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 public static class Utilities
 {

src/LibHac/Common/Validity.cs

@@ -1,4 +1,4 @@
-namespace LibHac;
+namespace LibHac.Common;
 
 public enum Validity : byte
 {

src/LibHac/Crypto/Impl/AesCtrModeNi.cs

@@ -4,6 +4,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
+using LibHac.Common;
 
 namespace LibHac.Crypto.Impl;
 

src/LibHac/CryptoOld.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Security.Cryptography;
+using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.FsSystem;
 

src/LibHac/Diag/Abort.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
+using LibHac.Common;
 
 namespace LibHac.Diag;
 

src/LibHac/FsSystem/Aes128CtrTransform.cs

@@ -3,6 +3,7 @@ using System.Buffers;
 using System.Buffers.Binary;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
+using LibHac.Common;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;

src/LibHac/FsSystem/Aes128XtsTransform.cs

@@ -28,6 +28,7 @@ using System;
 using System.Buffers;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
+using LibHac.Common;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;

src/LibHac/FsSystem/AesXtsFileHeader.cs

@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 

src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Util;
 

src/LibHac/FsSystem/IntegrityVerificationStorage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers;
 using System.IO;
+using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.Tools.FsSystem.Save;

src/LibHac/MemoryResource.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
+using LibHac.Common;
 using Buffer = LibHac.Mem.Buffer;
 
 namespace LibHac;

src/LibHac/Npdm/Aci0.cs

@@ -1,6 +1,7 @@
 // ReSharper disable UnusedVariable
 using System;
 using System.IO;
+using LibHac.Common;
 
 namespace LibHac.Npdm;
 

src/LibHac/Npdm/Acid.cs

@@ -1,6 +1,7 @@
 // ReSharper disable UnusedVariable
 using System;
 using System.IO;
+using LibHac.Common;
 using LibHac.Common.Keys;
 
 namespace LibHac.Npdm;

src/LibHac/Npdm/NpdmBinary.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Buffers.Binary;
 using System.IO;
+using LibHac.Common;
 using LibHac.Common.Keys;
 
 namespace LibHac.Npdm;

src/LibHac/Npdm/ServiceAccessControl.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using LibHac.Common;
 
 namespace LibHac.Npdm;
 

src/LibHac/Tools/Es/Ticket.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Util;
 

src/LibHac/Tools/Fs/XciHeader.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
+using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Crypto;
 using LibHac.Fs;

src/LibHac/Tools/FsSystem/NcaUtils/NcaExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers.Binary;
 using System.Diagnostics;
+using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;

src/LibHac/Tools/FsSystem/Save/AllocationTable.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 

src/LibHac/Tools/FsSystem/Save/Header.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Crypto;
 using LibHac.Fs;

src/LibHac/Tools/FsSystem/Save/JournalStorage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.IO;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 

src/LibHac/Tools/FsSystem/Save/RemapStorage.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 

src/LibHac/Tools/Ro/Nro.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 

src/LibHac/Tools/Settings/Calibration.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Text;
+using LibHac.Common;
 
 namespace LibHac.Tools.Settings;
 

src/hactoolnet/EnumStrings.cs

@@ -1,4 +1,4 @@
-using LibHac;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Ncm;

src/hactoolnet/Options.cs

@@ -1,4 +1,5 @@
 using LibHac;
+using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.FsSystem;
 

src/hactoolnet/Print.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Buffers.Binary;
 using System.Text;
-using LibHac;
+using LibHac.Common;
 using LibHac.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 

src/hactoolnet/ProcessBench.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
-using LibHac;
+using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Crypto.Impl;
 using LibHac.Fs;

src/hactoolnet/ProcessNax0.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Text;
-using LibHac;
 using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;

src/hactoolnet/ProcessPackage.cs

@@ -17,7 +17,7 @@ internal static class ProcessPackage
     {
         using var file = new SharedRef<IStorage>(new LocalStorage(ctx.Options.InFile, FileAccess.Read));
 
-        var package1 = new LibHac.Boot.Package1();
+        var package1 = new Package1();
         package1.Initialize(ctx.KeySet, in file).ThrowIfFailure();
 
         ctx.Logger.LogMessage(package1.Print());
@@ -54,7 +54,7 @@ internal static class ProcessPackage
         }
     }
 
-    private static string Print(this LibHac.Boot.Package1 package1)
+    private static string Print(this Package1 package1)
     {
         int colLen = 36;
         var sb = new StringBuilder();

src/hactoolnet/ProcessSave.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using LibHac;
 using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Fs;

src/hactoolnet/ProcessSwitchFs.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using LibHac;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;

src/hactoolnet/ProcessXci.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using LibHac;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Tools.Fs;

src/hactoolnet/Program.cs

@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using System.Text;
 using LibHac;
+using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Diag;
 using LibHac.Fs;
@@ -221,7 +222,7 @@ public static class Program
 
         var keySet = KeySet.CreateDefaultKeySet();
 
-        var logger = ctx.Options.DisableKeyWarns ? null : ctx.Logger;
+        IProgressReport logger = ctx.Options.DisableKeyWarns ? null : ctx.Logger;
 
         // If the user specifies a key file then only load that file into the mode they specified,
         // otherwise load both prod.keys and dev.keys.

tests/LibHac.Tests/DebugAssertHandler.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using LibHac.Common;
 
 namespace LibHac.Tests;
 

tests/LibHac.Tests/FsSystem/BucketTreeBuilderTests.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
+using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Tests.Common;