cleanup

AnakinRaW · AnakinRaW · commit 596a01c1512b · 2024-08-03T18:05:39.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,8 +55,6 @@ jobs:
         # Change into the artifacts directory to avoid including the directory itself in the zip archive
         working-directory: ./releases/net8.0
         run: zip -r ../ModVerify-Net8.zip .
-      - name: Rename .NET Framework executable
-        run: mv ./releases/net48/ModVerify.CliApp.exe ./releases/net48/ModVerify.exe
       - uses: dotnet/nbgv@v0.4.2
         id: nbgv
       - name: Create GitHub release
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ A `.JSON` file lists all found issues. Into seperate `.txt` files the same error
 
 You can also run the tool with command line arguments to adjust the tool to your needs. 
 
-To see all available options, open the command line and type:
+To see all available options, especially if you have custom folder setups, open the command line and type:
 
 ```bash
 ModVerify.exe --help
diff --git a/src/ModVerify.CliApp/ExtensionMethods.cs b/src/ModVerify.CliApp/ExtensionMethods.cs
@@ -1,7 +1,7 @@
 ﻿using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure.Games;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal static class ExtensionMethods
 {
diff --git a/src/ModVerify.CliApp/GameFinder/GameFinderResult.cs b/src/ModVerify.CliApp/GameFinder/GameFinderResult.cs
@@ -1,5 +1,5 @@
 ﻿using PG.StarWarsGame.Infrastructure.Games;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool.GameFinder;
 
 internal record GameFinderResult(IGame Game, IGame? FallbackGame);
diff --git a/src/ModVerify.CliApp/GameFinder/GameFinderService.cs b/src/ModVerify.CliApp/GameFinder/GameFinderService.cs
@@ -11,7 +11,7 @@
 using PG.StarWarsGame.Infrastructure.Services.Dependencies;
 using PG.StarWarsGame.Infrastructure.Services.Detection;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool.GameFinder;
 
 internal class GameFinderService
 {
diff --git a/src/ModVerify.CliApp/GameNotFoundException.cs b/src/ModVerify.CliApp/GameNotFoundException.cs
@@ -1,5 +1,5 @@
 ﻿using PG.StarWarsGame.Infrastructure.Games;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal class GameNotFoundException(string message) : GameException(message);
diff --git a/src/ModVerify.CliApp/ModSelectionResult.cs b/src/ModVerify.CliApp/ModSelectionResult.cs
diff --git a/src/ModVerify.CliApp/ModSelectors/AutomaticModSelector.cs b/src/ModVerify.CliApp/ModSelectors/AutomaticModSelector.cs
@@ -2,19 +2,20 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO.Abstractions;
+using AET.ModVerifyTool.GameFinder;
+using AET.ModVerifyTool.Options;
 using EawModinfo.Model;
 using EawModinfo.Spec;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using ModVerify.CliApp.Options;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure;
 using PG.StarWarsGame.Infrastructure.Games;
 using PG.StarWarsGame.Infrastructure.Mods;
 using PG.StarWarsGame.Infrastructure.Services;
 using PG.StarWarsGame.Infrastructure.Services.Dependencies;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal class AutomaticModSelector(IServiceProvider serviceProvider) : ModSelectorBase(serviceProvider)
 {
diff --git a/src/ModVerify.CliApp/ModSelectors/ConsoleModSelector.cs b/src/ModVerify.CliApp/ModSelectors/ConsoleModSelector.cs
@@ -1,12 +1,13 @@
 ﻿using System;
 using System.Collections.Generic;
+using AET.ModVerifyTool.GameFinder;
+using AET.ModVerifyTool.Options;
 using EawModinfo.Spec;
-using ModVerify.CliApp.Options;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure;
 using PG.StarWarsGame.Infrastructure.Mods;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal class ConsoleModSelector(IServiceProvider serviceProvider) : ModSelectorBase(serviceProvider)
 {
diff --git a/src/ModVerify.CliApp/ModSelectors/IModSelector.cs b/src/ModVerify.CliApp/ModSelectors/IModSelector.cs
@@ -1,8 +1,8 @@
-﻿using ModVerify.CliApp.Options;
+﻿using AET.ModVerifyTool.Options;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal interface IModSelector
 {
diff --git a/src/ModVerify.CliApp/ModSelectors/ManualModSelector.cs b/src/ModVerify.CliApp/ModSelectors/ManualModSelector.cs
@@ -1,9 +1,9 @@
 ﻿using System;
-using ModVerify.CliApp.Options;
+using AET.ModVerifyTool.Options;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal class ManualModSelector(IServiceProvider serviceProvider) : ModSelectorBase(serviceProvider)
 {
diff --git a/src/ModVerify.CliApp/ModSelectors/ModSelectorBase.cs b/src/ModVerify.CliApp/ModSelectors/ModSelectorBase.cs
@@ -1,15 +1,16 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using AET.ModVerifyTool.GameFinder;
+using AET.ModVerifyTool.Options;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using ModVerify.CliApp.Options;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure;
 using PG.StarWarsGame.Infrastructure.Mods;
 using PG.StarWarsGame.Infrastructure.Services.Dependencies;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal abstract class ModSelectorBase : IModSelector
 {
diff --git a/src/ModVerify.CliApp/ModSelectors/ModSelectorFactory.cs b/src/ModVerify.CliApp/ModSelectors/ModSelectorFactory.cs
@@ -1,7 +1,7 @@
 ﻿using System;
-using ModVerify.CliApp.Options;
+using AET.ModVerifyTool.Options;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal class ModSelectorFactory(IServiceProvider serviceProvider)
 {
diff --git a/src/ModVerify.CliApp/ModSelectors/SettingsBasedModSelector.cs b/src/ModVerify.CliApp/ModSelectors/SettingsBasedModSelector.cs
@@ -2,16 +2,16 @@
 using System.Globalization;
 using System.IO.Abstractions;
 using System.Linq;
+using AET.ModVerifyTool.Options;
 using EawModinfo.Model;
 using EawModinfo.Spec;
 using Microsoft.Extensions.DependencyInjection;
-using ModVerify.CliApp.Options;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Infrastructure;
 using PG.StarWarsGame.Infrastructure.Games;
 using PG.StarWarsGame.Infrastructure.Services.Name;
 
-namespace ModVerify.CliApp.ModSelectors;
+namespace AET.ModVerifyTool.ModSelectors;
 
 internal class SettingsBasedModSelector(IServiceProvider serviceProvider)
 {
diff --git a/src/ModVerify.CliApp/ModVerify.CliApp.csproj b/src/ModVerify.CliApp/ModVerify.CliApp.csproj
@@ -4,6 +4,8 @@
 		<IsPackable>false</IsPackable>
 		<TargetFrameworks>net8.0;net48</TargetFrameworks>
 		<OutputType>Exe</OutputType>
+		<RootNamespace>AET.ModVerifyTool</RootNamespace>
+		<AssemblyName>ModVerify</AssemblyName>
 		<ApplicationIcon>$(RepoRootPath)aet.ico</ApplicationIcon>
 		<Title>AET.ModVerify.CommandLine</Title>
 		<Product>AET.ModVerify</Product>
diff --git a/src/ModVerify.CliApp/ModVerifyApp.cs b/src/ModVerify.CliApp/ModVerifyApp.cs
@@ -5,12 +5,12 @@
 using System.Threading.Tasks;
 using AET.ModVerify;
 using AET.ModVerify.Reporting;
+using AET.ModVerifyTool.ModSelectors;
+using AET.ModVerifyTool.Options;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using ModVerify.CliApp.ModSelectors;
-using ModVerify.CliApp.Options;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal class ModVerifyApp(ModVerifyAppSettings settings, IServiceProvider services)
 {
diff --git a/src/ModVerify.CliApp/ModVerifyPipeline.cs b/src/ModVerify.CliApp/ModVerifyPipeline.cs
@@ -7,7 +7,7 @@
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Engine.Database;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal class ModVerifyPipeline(
     GameEngineType targetType,
diff --git a/src/ModVerify.CliApp/Options/GameInstallationsSettings.cs b/src/ModVerify.CliApp/Options/GameInstallationsSettings.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using PG.StarWarsGame.Engine;
 
-namespace ModVerify.CliApp.Options;
+namespace AET.ModVerifyTool.Options;
 
 internal record GameInstallationsSettings
 {
diff --git a/src/ModVerify.CliApp/Options/ModVerifyAppSettings.cs b/src/ModVerify.CliApp/Options/ModVerifyAppSettings.cs
@@ -1,8 +1,8 @@
 ﻿using System;
-using AET.ModVerify.Settings;
 using System.Diagnostics.CodeAnalysis;
+using AET.ModVerify.Settings;
 
-namespace ModVerify.CliApp.Options;
+namespace AET.ModVerifyTool.Options;
 
 internal record ModVerifyAppSettings
 {
diff --git a/src/ModVerify.CliApp/Options/ModVerifyOptions.cs b/src/ModVerify.CliApp/Options/ModVerifyOptions.cs
@@ -3,7 +3,7 @@
 using CommandLine;
 using PG.StarWarsGame.Engine;
 
-namespace ModVerify.CliApp.Options;
+namespace AET.ModVerifyTool.Options;
 
 internal class ModVerifyOptions
 {
diff --git a/src/ModVerify.CliApp/Program.cs b/src/ModVerify.CliApp/Program.cs
@@ -7,6 +7,7 @@
 using AET.ModVerify.Reporting.Reporters;
 using AET.ModVerify.Reporting.Reporters.JSON;
 using AET.ModVerify.Reporting.Reporters.Text;
+using AET.ModVerifyTool.Options;
 using AET.SteamAbstraction;
 using AnakinRaW.CommonUtilities.Hashing;
 using AnakinRaW.CommonUtilities.Registry;
@@ -15,7 +16,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Console;
-using ModVerify.CliApp.Options;
 using PG.Commons.Extensibility;
 using PG.StarWarsGame.Engine;
 using PG.StarWarsGame.Files.ALO;
@@ -30,7 +30,7 @@
 using Serilog.Events;
 using Serilog.Filters;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal class Program
 {
diff --git a/src/ModVerify.CliApp/SettingsBuilder.cs b/src/ModVerify.CliApp/SettingsBuilder.cs
@@ -4,10 +4,10 @@
 using System.IO.Abstractions;
 using AET.ModVerify.Reporting;
 using AET.ModVerify.Settings;
+using AET.ModVerifyTool.Options;
 using Microsoft.Extensions.DependencyInjection;
-using ModVerify.CliApp.Options;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal class SettingsBuilder(IServiceProvider services)
 {
diff --git a/src/ModVerify.CliApp/VerifyGameInstallationData.cs b/src/ModVerify.CliApp/VerifyGameInstallationData.cs
@@ -1,7 +1,7 @@
 ﻿using System.Text;
 using PG.StarWarsGame.Engine;
 
-namespace ModVerify.CliApp;
+namespace AET.ModVerifyTool;
 
 internal class VerifyGameInstallationData
 {
diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj
@@ -7,6 +7,7 @@
 		<Description>Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications.</Description>
 		<PackageId>AlamoEngineTools.ModVerify</PackageId>
 		<RootNamespace>AET.ModVerify</RootNamespace>
+		<AssemblyName>AET.ModVerify</AssemblyName>
 		<PackageTags>alamo,petroglyph,glyphx</PackageTags>
 	</PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using PG.StarWarsGame.Engine;`
`2`	`2`	`using PG.StarWarsGame.Infrastructure.Games;`
`3`	`3`
`4`		`-namespace ModVerify.CliApp;`
	`4`	`+namespace AET.ModVerifyTool;`
`5`	`5`
`6`	`6`	`internal static class ExtensionMethods`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`using PG.StarWarsGame.Infrastructure.Services.Dependencies;`
`12`	`12`	`using PG.StarWarsGame.Infrastructure.Services.Detection;`
`13`	`13`
`14`		`-namespace ModVerify.CliApp;`
	`14`	`+namespace AET.ModVerifyTool.GameFinder;`
`15`	`15`
`16`	`16`	`internal class GameFinderService`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-using ModVerify.CliApp.Options;`
	`1`	`+using AET.ModVerifyTool.Options;`
`2`	`2`	`using PG.StarWarsGame.Engine;`
`3`	`3`	`using PG.StarWarsGame.Infrastructure;`
`4`	`4`
`5`		`-namespace ModVerify.CliApp.ModSelectors;`
	`5`	`+namespace AET.ModVerifyTool.ModSelectors;`
`6`	`6`
`7`	`7`	`internal interface IModSelector`
`8`	`8`	`{`