General Updates

WOA-Project · Feb 10, 2024 · 7567eb5 · 7567eb5
1 parent 5dae0b7
commit 7567eb5
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 44 deletions.
diff --git a/FirmwareGen.sln b/FirmwareGen.sln
@@ -35,8 +35,8 @@ Global
 		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|ARM32.ActiveCfg = Release|Any CPU
 		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|ARM32.Build.0 = Release|Any CPU
-		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|ARM64.Build.0 = Release|Any CPU
+		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|ARM64.ActiveCfg = Release|arm64
+		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|ARM64.Build.0 = Release|arm64
 		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|x64.ActiveCfg = Release|x64
 		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|x64.Build.0 = Release|x64
 		{85918ACF-6909-45DA-B56D-3D5113B7EA6C}.Release|x86.ActiveCfg = Release|x86
@@ -55,8 +55,8 @@ Global
 		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|ARM32.ActiveCfg = Release|Any CPU
 		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|ARM32.Build.0 = Release|Any CPU
-		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|ARM64.Build.0 = Release|Any CPU
+		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|ARM64.ActiveCfg = Release|ARM64
+		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|ARM64.Build.0 = Release|ARM64
 		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|x64.ActiveCfg = Release|Any CPU
 		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|x64.Build.0 = Release|Any CPU
 		{AC699AC2-883A-4278-B2A8-F0F693DC8643}.Release|x86.ActiveCfg = Release|Any CPU

diff --git a/FirmwareGen/FirmwareGen.csproj b/FirmwareGen/FirmwareGen.csproj
@@ -6,7 +6,7 @@
 		<OutputPath>$(SolutionDir)build\$(Platform)\$(Configuration)\FirmwareGen\</OutputPath>
 		<IntermediateOutputPath>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\FirmwareGen\</IntermediateOutputPath>
 		<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-		<Platforms>AnyCPU;x64;x86;arm64</Platforms>
+		<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/FirmwareGen/Logging.cs b/FirmwareGen/Logging.cs
@@ -1,39 +1,30 @@
 /*
-
-Copyright (c) 2019, Gustave Monce - gus33000.me - @gus33000
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-*/
+ * Copyright (c) Gustave Monce and Contributors
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 using System;
 
 namespace FirmwareGen
 {
     internal static class Logging
     {
-        private static readonly ConsoleColor StockColor;
-
-        static Logging()
-        {
-            StockColor = Console.ForegroundColor;
-        }
-
         public enum LoggingLevel
         {
             Information,
@@ -70,6 +61,13 @@ private static string GetDismLikeProgBar(int perc)
             return "[" + bases + "]";
         }
 
+        private static readonly ConsoleColor Foreground;
+
+        static Logging()
+        {
+            Foreground = Console.ForegroundColor;
+        }
+
         private static readonly object lockObj = new();
 
         public static void Log(string message, LoggingLevel severity = LoggingLevel.Information, bool returnline = true)
@@ -90,13 +88,15 @@ public static void Log(string message, LoggingLevel severity = LoggingLevel.Info
                         msg = "  Warning  ";
                         Console.ForegroundColor = ConsoleColor.Yellow;
                         break;
+
                     case LoggingLevel.Error:
                         msg = "   Error   ";
                         Console.ForegroundColor = ConsoleColor.Red;
                         break;
+
                     case LoggingLevel.Information:
                         msg = "Information";
-                        Console.ForegroundColor = StockColor;
+                        Console.ForegroundColor = Foreground;
                         break;
                 }
 
@@ -109,7 +109,7 @@ public static void Log(string message, LoggingLevel severity = LoggingLevel.Info
                     Console.Write("\r" + DateTime.Now.ToString("'['HH':'mm':'ss']'") + "[" + msg + "] " + message);
                 }
 
-                Console.ForegroundColor = StockColor;
+                Console.ForegroundColor = Foreground;
             }
         }
     }

diff --git a/PartitionOffsetsHelperTool/DeviceProfiles/Constants.cs b/PartitionOffsetsHelperTool/DeviceProfiles/Constants.cs
@@ -1,4 +1,5 @@
 using PartitionOffsetsHelperTool.GPT;
+using System;
 
 namespace PartitionOffsetsHelperTool.DeviceProfiles
 {

diff --git a/PartitionOffsetsHelperTool/GPT/GPTPartition.cs b/PartitionOffsetsHelperTool/GPT/GPTPartition.cs
@@ -1,4 +1,6 @@
-namespace PartitionOffsetsHelperTool.GPT
+using System;
+
+namespace PartitionOffsetsHelperTool.GPT
 {
     public class GPTPartition
     {

diff --git a/PartitionOffsetsHelperTool/GPT/GPTUtils.cs b/PartitionOffsetsHelperTool/GPT/GPTUtils.cs
@@ -1,4 +1,8 @@
-namespace PartitionOffsetsHelperTool.GPT
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PartitionOffsetsHelperTool.GPT
 {
     internal class GPTUtils
     {

diff --git a/PartitionOffsetsHelperTool/PartitionOffsetsHelperTool.csproj b/PartitionOffsetsHelperTool/PartitionOffsetsHelperTool.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows</TargetFramework>
+		<OutputType>Exe</OutputType>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<OutputPath>$(SolutionDir)build\$(Platform)\$(Configuration)\PartitionOffsetsHelperTool\</OutputPath>
+		<IntermediateOutputPath>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\PartitionOffsetsHelperTool\</IntermediateOutputPath>
+		<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+		<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
+	</PropertyGroup>
 
 </Project>
diff --git a/PartitionOffsetsHelperTool/Program.cs b/PartitionOffsetsHelperTool/Program.cs
@@ -1,4 +1,5 @@
 using PartitionOffsetsHelperTool.GPT;
+using System;
 
 namespace PartitionOffsetsHelperTool
 {