Auto update

.github/workflows/release.yml

@@ -13,8 +13,8 @@ on:
 
 env:
   TOOL_PROJ_PATH: ./src/ModVerify.CliApp/ModVerify.CliApp.csproj
-  CREATOR_PROJ_PATH: ./Modules/ModdingToolBase/src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj
-  UPLOADER_PROJ_PATH: ./Modules/ModdingToolBase/src/AnakinApps/FtpUploader/FtpUploader.csproj
+  CREATOR_PROJ_PATH: ./modules/ModdingToolBase/src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj
+  UPLOADER_PROJ_PATH: ./modules/ModdingToolBase/src/AnakinApps/FtpUploader/FtpUploader.csproj
   TOOL_EXE: ModVerify.exe
   UPDATER_EXE: AnakinRaW.ExternalUpdater.exe
   MANIFEST_CREATOR: AnakinRaW.ApplicationManifestCreator.dll
@@ -35,18 +35,20 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
       - name: Create NetFramework Release
-        run:  dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net48 --output ./releases/net48 /p:DebugType=None /p:DebugSymbols=false
+        # use build for .NET Framework to enusre external updatere .EXE is included
+        run:  dotnet build ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net481 --output ./releases/net481 /p:DebugType=None /p:DebugSymbols=false
       - name: Create Net Core Release
-        run:  dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net9.0 --output ./releases/net9.0 /p:DebugType=None /p:DebugSymbols=false
+        # use publish for .NET Core
+        run:  dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net10.0 --output ./releases/net10.0 /p:DebugType=None /p:DebugSymbols=false
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Binary Releases
           path: ./releases
@@ -62,17 +64,45 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/download-artifact@v5
+          submodules: recursive
+      - uses: actions/download-artifact@v6
         with:
           name: Binary Releases
           path: ./releases
+
+      # Deploy .NET Framework self-update release
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+            dotnet-version: 10.0.x
+      - name: Build Creator
+        run: dotnet build ${{env.CREATOR_PROJ_PATH}} --configuration Release --output ./dev
+      - name: Build Uploader
+        run: dotnet build ${{env.UPLOADER_PROJ_PATH}} --configuration Release --output ./dev
+      - name: Create binaries directory
+        run: mkdir -p ./deploy
+      - name: Copy self-update files
+        run: |
+          cp ./releases/net481/${{env.TOOL_EXE}} ./deploy/
+          cp ./releases/net481/${{env.UPDATER_EXE}} ./deploy/
+      - name: Create Manifest
+        run: dotnet ./dev/${{env.MANIFEST_CREATOR}} -a deploy/${{env.TOOL_EXE}} --appDataFiles deploy/${{env.UPDATER_EXE}} --origin ${{env.ORIGIN_BASE}} -o ./deploy -b ${{env.BRANCH_NAME}}
+      - name: Upload Build
+        run: dotnet ./dev/${{env.SFTP_UPLOADER}} ftp --host $host --port $port -u ${{secrets.SFTP_USER}} -p ${{secrets.SFTP_PASSWORD}} --base $base_path -s $source
+        env:
+          host: republicatwar.com
+          port: 1579
+          base_path: ${{env.ORIGIN_BASE_PART}}
+          source: ./deploy
+
+      # Deploy .NET Core and .NET Framework apps to Github
       - name: Create NET Core .zip
         # Change into the artifacts directory to avoid including the directory itself in the zip archive
-        working-directory: ./releases/net9.0
-        run: zip -r ../ModVerify-Net9.zip .
+        working-directory: ./releases/net10.0
+        run: zip -r ../ModVerify-Net10.zip .
       - uses: dotnet/nbgv@v0.4.2
         id: nbgv
       - name: Create GitHub release
@@ -86,5 +116,5 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           generate_release_notes: true
           files: | 
-            ./releases/net48/ModVerify.exe
-            ./releases/ModVerify-Net9.zip
+            ./releases/net481/ModVerify.exe
+            ./releases/ModVerify-Net10.zip

.github/workflows/test.yml

@@ -19,12 +19,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         submodules: recursive
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Build & Test in Release Mode
       run: dotnet test --configuration Release

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "modules/ModdingToolBase"]
+	path = modules/ModdingToolBase
+	url = https://github.com/AnakinRaW/ModdingToolBase

Directory.Build.props

@@ -24,7 +24,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<LangVersion>latest</LangVersion>
+		<LangVersion>preview</LangVersion>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<EnableNETAnalyzers>True</EnableNETAnalyzers>
@@ -39,7 +39,7 @@
 		</PackageReference>
 		<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
 			<PrivateAssets>all</PrivateAssets>
-			<Version>3.7.115</Version>
+			<Version>3.9.50</Version>
 		</PackageReference>
 		<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="" />
 	</ItemGroup>

ModVerify.slnx

@@ -0,0 +1,28 @@
+<Solution>
+  <Folder Name="/ModdingToolBase/" />
+  <Folder Name="/ModdingToolBase/AnakinApps/">
+    <Project Path="modules/ModdingToolBase/src/AnakinApps/ApplicationBase.CommandLine/ApplicationBase.CommandLine.csproj" />
+    <Project Path="modules/ModdingToolBase/src/AnakinApps/ApplicationBase.Shared/ApplicationBase.Shared.shproj" />
+    <Project Path="modules/ModdingToolBase/src/AnakinApps/ApplicationBase/ApplicationBase.csproj" />
+  </Folder>
+  <Folder Name="/ModdingToolBase/DeployTools/">
+    <Project Path="modules/ModdingToolBase/src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj" />
+    <Project Path="modules/ModdingToolBase/src/AnakinApps/FtpUploader/FtpUploader.csproj" />
+  </Folder>
+  <Folder Name="/ModdingToolBase/UpdateFrameworks/">
+    <Project Path="modules/ModdingToolBase/src/Updater/AppUpdaterFramework.Attributes/AppUpdaterFramework.Attributes.csproj" />
+    <Project Path="modules/ModdingToolBase/src/Updater/AppUpdaterFramework.Manifest/AppUpdaterFramework.Manifest.csproj" />
+    <Project Path="modules/ModdingToolBase/src/Updater/AppUpdaterFramework/AppUpdaterFramework.csproj" />
+    <Project Path="modules/ModdingToolBase/src/Updater/ExternalUpdater.App/ExternalUpdater.App.csproj" />
+    <Project Path="modules/ModdingToolBase/src/Updater/ExternalUpdater.Core/ExternalUpdater.Core.csproj" />
+  </Folder>
+  <Folder Name="/PetroglyphTools/">
+    <Project Path="src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj" />
+    <Project Path="src/PetroglyphTools/PG.StarWarsGame.Files.ALO/PG.StarWarsGame.Files.ALO.csproj" />
+    <Project Path="src/PetroglyphTools/PG.StarWarsGame.Files.ChunkFiles/PG.StarWarsGame.Files.ChunkFiles.csproj" />
+    <Project Path="src/PetroglyphTools/PG.StarWarsGame.Files.XML/PG.StarWarsGame.Files.XML.csproj" />
+  </Folder>
+  <Project Path="src/ModVerify.CliApp/ModVerify.CliApp.csproj" />
+  <Project Path="src/ModVerify/ModVerify.csproj" />
+  <Project Path="test/ModVerify.CliApp.Test/ModVerify.CliApp.Test.csproj" />
+</Solution>

src/ModVerify.CliApp/GameFinder/GameFinderResult.cs

@@ -1,5 +1,5 @@
 using PG.StarWarsGame.Infrastructure.Games;
 
-namespace AET.ModVerifyTool.GameFinder;
+namespace AET.ModVerify.App.GameFinder;
 
 internal record GameFinderResult(IGame Game, IGame? FallbackGame);

src/ModVerify.CliApp/GameFinder/GameFinderService.cs

@@ -10,7 +10,7 @@
 using PG.StarWarsGame.Infrastructure.Services;
 using PG.StarWarsGame.Infrastructure.Services.Detection;
 
-namespace AET.ModVerifyTool.GameFinder;
+namespace AET.ModVerify.App.GameFinder;
 
 internal class GameFinderService
 {
@@ -79,7 +79,7 @@ private bool TryDetectGame(GameType gameType, IList<IGameDetector> detectors, ou
         catch (Exception e)
         {
             result = GameDetectionResult.NotInstalled(gameType);
-            _logger?.LogTrace($"Unable to find game installation: {e.Message}");
+            _logger?.LogTrace("Unable to find game installation: {Message}", e.Message);
             return false;
         }
     }
@@ -97,7 +97,8 @@ private GameFinderResult FindGames(IList<IGameDetector> detectors)
         if (result.GameLocation is null)
             throw new GameNotFoundException("Unable to find game installation: Wrong install path?");
 
-        _logger?.LogInformation($"Found game installation: {result.GameIdentity} at {result.GameLocation.FullName}");
+        _logger?.LogInformation(ModVerifyConstants.ConsoleEventId, 
+            "Found game installation: {ResultGameIdentity} at {GameLocationFullName}", result.GameIdentity, result.GameLocation.FullName);
 
         var game = _gameFactory.CreateGame(result, CultureInfo.InvariantCulture);
 
@@ -118,7 +119,8 @@ private GameFinderResult FindGames(IList<IGameDetector> detectors)
             if (!TryDetectGame(GameType.Eaw, fallbackDetectors, out var fallbackResult) || fallbackResult.GameLocation is null)
                 throw new GameNotFoundException("Unable to find fallback game installation: Wrong install path?");
 
-            _logger?.LogInformation($"Found fallback game installation: {fallbackResult.GameIdentity} at {fallbackResult.GameLocation.FullName}");
+            _logger?.LogInformation(ModVerifyConstants.ConsoleEventId, 
+                "Found fallback game installation: {FallbackResultGameIdentity} at {GameLocationFullName}", fallbackResult.GameIdentity, fallbackResult.GameLocation.FullName);
 
             fallbackGame = _gameFactory.CreateGame(fallbackResult, CultureInfo.InvariantCulture);
 

src/ModVerify.CliApp/GameNotFoundException.cs → src/ModVerify.CliApp/GameFinder/GameNotFoundException.cs

@@ -1,5 +1,5 @@
 using PG.StarWarsGame.Infrastructure.Games;
 
-namespace AET.ModVerifyTool;
+namespace AET.ModVerify.App.GameFinder;
 
 internal class GameNotFoundException(string message) : GameException(message);