Skip to content

New Version #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnakinRaW merged 12 commits into from
Mar 8, 2026
Merged

New Version #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3bc9c12
update subs
AnakinRaW May 23, 2025
73b667a
update sub
AnakinRaW May 23, 2025
539c7a4
increase git timeout
AnakinRaW Mar 8, 2026
84aa558
update to new libs
AnakinRaW Mar 8, 2026
4ce8bd2
prettier logging
AnakinRaW Mar 8, 2026
7dea09f
draft new make all apps compile
AnakinRaW Mar 8, 2026
a1d1112
draft localization verify
AnakinRaW Mar 8, 2026
996a9f4
add localization verification
AnakinRaW Mar 8, 2026
f455c8e
add file type validation for localization verification
AnakinRaW Mar 8, 2026
2f41e8d
add step to localize unsupported speech files during build
AnakinRaW Mar 8, 2026
efc06c6
fix deploy
AnakinRaW Mar 8, 2026
0ef75dd
Merge pull request #26 from AnakinRaW/verify-loc
AnakinRaW Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Create Manifest
run: dotnet ./dev/${{env.MANIFEST_CREATOR}} -a binaries/${{env.TOOL_EXE}} --appDataFiles binaries/${{env.UPDATER_EXE}} --origin ${{env.ORIGIN_BASE}} -o ./binaries -b ${{env.BRANCH_NAME}}
- name: Upload Build
run: dotnet ./dev/${{env.SFTP_UPLOADER}} -h $host --port $port -u ${{secrets.SFTP_USER}} -p ${{secrets.SFTP_PASSWORD}} --base $base_path -s $source
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
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<PrivateAssets>all</PrivateAssets>
<Version>3.7.115</Version>
<Version>3.9.50</Version>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ModVerify
Open in desktop
Submodule ModVerify updated 158 files
2 changes: 1 addition & 1 deletion ModdingToolBase
Open in desktop
Submodule ModdingToolBase updated 61 files
+1 −1 Directory.Build.props
+0 −145 ModdingToolBase.sln
+29 −0 ModdingToolBase.slnx
+212 −30 src/AnakinApps/ApplicationBase.CommandLine/ConsoleUtilities.cs
+297 −0 src/AnakinApps/ApplicationBase.CommandLine/HorizontalConsoleFrame.cs
+4 −0 src/AnakinApps/ApplicationBase.CommandLine/Update/Options/ApplicationUpdateOptions.cs
+3 −3 src/AnakinApps/ApplicationBase.Shared/ApplicationBranchUtilities.cs
+2 −2 src/AnakinApps/ApplicationBase.WPF/ApplicationBase.WPF.csproj
+9 −9 src/AnakinApps/ApplicationBase/ApplicationBase.csproj
+0 −2 src/AnakinApps/ApplicationBase/Environment/UpdatableApplicationEnvironment.cs
+59 −22 src/AnakinApps/ApplicationBase/SelfUpdateableAppLifecycle.cs
+1 −1 src/AnakinApps/ApplicationBase/Update/ApplicationBranchManager.cs
+6 −6 src/AnakinApps/ApplicationBase/Update/ApplicationUpdater.cs
+14 −10 src/AnakinApps/ApplicationBase/Update/SelfUpdateRestartHandler.cs
+1 −1 src/AnakinApps/ApplicationBase/Utilities/CosturaResourceExtractor.cs
+2 −2 src/AnakinApps/ApplicationBase/Utilities/UnobservedTaskExceptionHandler.cs
+7 −7 src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj
+2 −2 src/AnakinApps/ApplicationManifestCreator/ManifestCreator.cs
+1 −1 src/AnakinApps/ApplicationManifestCreator/Program.cs
+1 −1 src/AnakinApps/ApplicationManifestCreator/Properties/launchSettings.json
+15 −1 src/AnakinApps/FtpUploader/FtpUploadOptions.cs
+8 −8 src/AnakinApps/FtpUploader/FtpUploader.csproj
+57 −0 src/AnakinApps/FtpUploader/LocalUploader.cs
+16 −5 src/AnakinApps/FtpUploader/Program.cs
+6 −2 src/AnakinApps/FtpUploader/Properties/launchSettings.json
+76 −0 src/AnakinApps/FtpUploader/SftpUploader.cs
+31 −77 src/AnakinApps/FtpUploader/Uploader.cs
+5 −5 src/CommonUtilities/CommonUtilities.WPF.ApplicationFramework/CommonUtilities.WPF.ApplicationFramework.csproj
+4 −4 src/CommonUtilities/CommonUtilities.WPF.Controls/CommonUtilities.WPF.Controls.csproj
+7 −7 src/CommonUtilities/CommonUtilities.WPF.Core/CommonUtilities.WPF.Core.csproj
+1 −1 src/CommonUtilities/CommonUtilities.WPF.Core/DPI/DisplayHelper.cs
+3 −3 src/CommonUtilities/CommonUtilities.WPF.Core/DPI/DisplayInfo.cs
+3 −3 src/CommonUtilities/CommonUtilities.WPF.Core/DPI/DpiHelper.cs
+2 −2 src/CommonUtilities/CommonUtilities.WPF.Imaging/CommonUtilities.WPF.Imaging.csproj
+1 −1 src/CommonUtilities/CommonUtilities.Windows/CommonUtilities.Windows.csproj
+2 −2 src/Updater/AppUpdaterFramework.Manifest/AppUpdaterFramework.Manifest.csproj
+3 −3 src/Updater/AppUpdaterFramework.WPF/AppUpdaterFramework.WPF.csproj
+6 −6 src/Updater/AppUpdaterFramework/AppUpdaterFramework.csproj
+10 −4 src/Updater/AppUpdaterFramework/Configuration/UpdateConfiguration.cs
+2 −2 src/Updater/AppUpdaterFramework/Handlers/Interaction/DefaultLockedFileInteractionHandler.cs
+3 −3 src/Updater/AppUpdaterFramework/Handlers/LockedFileHandler.cs
+6 −6 src/Updater/AppUpdaterFramework/Installer/FileInstaller.cs
+4 −4 src/Updater/AppUpdaterFramework/Installer/InstallerBase.cs
+8 −0 src/Updater/AppUpdaterFramework/Manifest/IManifestValidatorProvider.cs
+7 −4 src/Updater/AppUpdaterFramework/Manifest/ManifestFileDownloader.cs
+1 −1 src/Updater/AppUpdaterFramework/Product/BranchManagerBase.cs
+3 −2 src/Updater/AppUpdaterFramework/Storage/DownloadRepositoryFactory.cs
+5 −7 src/Updater/AppUpdaterFramework/Updater/Internal/ApplicationUpdater.cs
+4 −4 src/Updater/AppUpdaterFramework/Updater/Internal/UpdateCleanPipeline.cs
+36 −28 src/Updater/AppUpdaterFramework/Updater/Internal/UpdatePipeline.cs
+20 −17 src/Updater/AppUpdaterFramework/Updater/Tasks/DownloadStep.cs
+14 −10 src/Updater/AppUpdaterFramework/Updater/Tasks/InstallStep.cs
+1 −1 src/Updater/Directory.Build.props
+7 −7 src/Updater/ExternalUpdater.App/ExternalUpdater.App.csproj
+2 −2 src/Updater/ExternalUpdater.App/Program.cs
+1 −1 src/Updater/ExternalUpdater.App/Tools/UpdateTool.cs
+8 −7 src/Updater/ExternalUpdater.App/Utilities/ExternalUpdater.cs
+6 −4 src/Updater/ExternalUpdater.App/Utilities/ProcessTools.cs
+4 −4 src/Updater/ExternalUpdater.Core/ExternalUpdater.Core.csproj
+1 −1 src/Updater/ExternalUpdater.Core/Services/ExternalUpdaterLauncher.cs
+1 −1 src/Updater/version.json
11 changes: 2 additions & 9 deletions RawDevTools.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33626.354
# Visual Studio Version 18
VisualStudioVersion = 18.4.11519.219 insiders
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevLauncher", "src\DevLauncher\DevLauncher.csproj", "{1BA491BC-2CD6-4270-9573-5FF9529D8D89}"
EndProject
Expand Down Expand Up @@ -39,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PG.StarWarsGame.Files.ALO",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PG.StarWarsGame.Engine", "ModVerify\src\PetroglyphTools\PG.StarWarsGame.Engine\PG.StarWarsGame.Engine.csproj", "{301A0BA8-303F-415E-A961-4755FB3978D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModVerify.CliApp", "ModVerify\src\ModVerify.CliApp\ModVerify.CliApp.csproj", "{C5703F53-DC3D-4B4E-9E18-365124C72793}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawDevTools", "src\RawDevTools\RawDevTools.csproj", "{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextCompile", "src\TextCompile\TextCompile.csproj", "{50E34854-BF6B-4170-BB4C-74830AB5609B}"
Expand Down Expand Up @@ -113,10 +111,6 @@ Global
{301A0BA8-303F-415E-A961-4755FB3978D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{301A0BA8-303F-415E-A961-4755FB3978D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{301A0BA8-303F-415E-A961-4755FB3978D8}.Release|Any CPU.Build.0 = Release|Any CPU
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Release|Any CPU.Build.0 = Release|Any CPU
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -163,7 +157,6 @@ Global
{D6AC444F-5CC4-4DAC-B974-E3E64B9761A3} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
{94267A81-F31C-4381-9E2B-868C0AC0E65A} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
{301A0BA8-303F-415E-A961-4755FB3978D8} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
{C5703F53-DC3D-4B4E-9E18-365124C72793} = {D4C9B8AA-96E5-49F4-B8A4-765144E16548}
{50E34854-BF6B-4170-BB4C-74830AB5609B} = {5A7785E7-C59E-4F2D-9596-352844693272}
{BB759AD8-EEAC-4994-80A8-34E60B2FDA86} = {5A7785E7-C59E-4F2D-9596-352844693272}
{846253D9-D766-8852-74B9-E1E04B9F2A81} = {3E986062-E81F-4833-A127-24FA73FBCB1B}
Expand Down
10 changes: 5 additions & 5 deletions src/DevLauncher.Tests/DevLauncher.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PackageReference Include="coverlet.collector" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="Testably.Abstractions.Testing" Version="4.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Testably.Abstractions.Testing" Version="5.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
28 changes: 18 additions & 10 deletions src/DevLauncher/DevLauncher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CompuMaster.Text.Diff" Version="2024.11.4.100" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="CompuMaster.Text.Diff" Version="2025.12.29" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
<PackageReference Include="AlamoEngineTools.SteamAbstraction" Version="4.0.35" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.8" />
<PackageReference Include="AlamoEngineTools.SteamAbstraction" Version="5.0.1" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="13.0.1" />
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageReference Include="Antlr4BuildTasks" Version="12.10.0" />
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.3.8" />
<PackageReference Include="Antlr4BuildTasks" Version="12.14.0" />
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="13.0.1" />
<PackageReference Include="Glob" Version="1.1.9" />
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
Expand All @@ -38,20 +38,28 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="IndexRange" Version="1.0.3">
<PackageReference Include="PolySharp" Version="1.15.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PolySharp" Version="1.15.0">
<PrivateAssets>all</PrivateAssets>
</ItemGroup>

<!-- Exclude System.Index from all dependencies, excluding Microsoft.Bcl.Memory -->
<ItemGroup>
<PackageReference Include="Vanara.Core" Version="5.0.0">
<ExcludeAssets>compile</ExcludeAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="IndexRange" Version="1.0.3">
<ExcludeAssets>compile</ExcludeAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.3"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\ModdingToolBase\src\AnakinApps\ApplicationBase.CommandLine\ApplicationBase.CommandLine.csproj" />
<ProjectReference Include="..\..\ModdingToolBase\src\Updater\AppUpdaterFramework.Manifest\AppUpdaterFramework.Manifest.csproj" />
<ProjectReference Include="..\..\ModVerify\src\ModVerify\ModVerify.csproj" />
<ProjectReference Include="..\..\ModVerify\src\PetroglyphTools\PG.StarWarsGame.Engine\PG.StarWarsGame.Engine.csproj" />
<ProjectReference Include="..\..\ModVerify\src\PetroglyphTools\PG.StarWarsGame.Files.ALO\PG.StarWarsGame.Files.ALO.csproj" />
<ProjectReference Include="..\RawDevTools\RawDevTools.csproj" />
Expand Down
5 changes: 2 additions & 3 deletions src/DevLauncher/DevLauncherEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@

namespace RepublicAtWar.DevLauncher;

internal class DevLauncherEnvironment(Assembly assembly, IFileSystem fileSystem) : UpdatableApplicationEnvironment(assembly, fileSystem)
internal class DevLauncherEnvironment(Assembly assembly, IFileSystem fileSystem)
: UpdatableApplicationEnvironment(assembly, fileSystem)
{
private const string ToolPathName = "RawDevLauncher";

public override string ApplicationName => "Republic at War DevLauncher";

public override Uri? RepositoryUrl => null;

public override ICollection<Uri> UpdateMirrors { get; } = new List<Uri>
{
new($"https://republicatwar.com/downloads/{ToolPathName}")
Expand Down
6 changes: 0 additions & 6 deletions src/DevLauncher/Options/VerifyOption.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/DevLauncher/Pipelines/Actions/CreateLocalizationDiffsAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected override void RunAction(CancellationToken cancellationToken)
if (locFile.Language == LanguageType.English)
continue;

Logger?.LogInformation($"Creating Diff for data '{langFile}'");
Logger?.LogInformation("Creating Diff for data '{LangFile}'", langFile);

var masterText = _localizationFileService.CreateModelFromLocalizationFile(locFile);

Expand Down
4 changes: 2 additions & 2 deletions src/DevLauncher/Pipelines/Actions/InitializeLocalizationAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ internal class InitializeLocalizationAction(IServiceProvider serviceProvider) :

protected override void RunAction(CancellationToken cancellationToken)
{
Logger?.LogInformation($"Processing data '{EnglishDAT}'");
Logger?.LogInformation("Processing data '{DatFile}'", EnglishDAT);

var englishMtfPath = _fileSystem.Path.Combine("Data\\Text", EnglishDAT);
var englishMasterText = _datFileService.LoadAs(englishMtfPath, DatFileType.OrderedByCrc32).Content;
Expand All @@ -40,7 +40,7 @@ protected override void RunAction(CancellationToken cancellationToken)

foreach (var datFile in datFiles)
{
Logger?.LogInformation($"Processing data '{_fileSystem.Path.GetFileName(datFile)}'");
Logger?.LogInformation("Processing data '{FileName}'", _fileSystem.Path.GetFileName(datFile));

var language = _localizationFileService.LanguageNameFromFileName(datFile.AsSpan());

Expand Down
3 changes: 2 additions & 1 deletion src/DevLauncher/Pipelines/BuildAndRunPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using AnakinRaW.CommonUtilities.SimplePipeline;
using AnakinRaW.CommonUtilities.SimplePipeline.Steps;
Expand All @@ -22,7 +23,7 @@ internal class BuildAndRunPipeline(
private readonly BuildSettings _buildSettings = buildSettings ?? throw new ArgumentNullException(nameof(buildSettings));
private readonly LaunchSettings _launchSettings = launchSettings ?? throw new ArgumentNullException(nameof(launchSettings));

protected override Task<IList<IStep>> BuildSteps()
protected override Task<IList<IStep>> CreateRunnerSteps(CancellationToken token)
{
return Task.FromResult<IList<IStep>>(new List<IStep>
{
Expand Down
80 changes: 0 additions & 80 deletions src/DevLauncher/Pipelines/BuildAndVerifyPipeline.cs
View file
Open in desktop

This file was deleted.

Loading
Loading