Skip to content

Commit d7db113

Browse files
AnakinRaWAnakinRaW
authored
New Version (#27)
* update subs * update sub * increase git timeout * update to new libs * prettier logging * draft new make all apps compile * draft localization verify * add localization verification * add file type validation for localization verification * add step to localize unsupported speech files during build * fix deploy
1 parent 48d6626 commit d7db113

42 files changed

Lines changed: 738 additions & 362 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Create Manifest
7878
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}}
7979
- name: Upload Build
80-
run: dotnet ./dev/${{env.SFTP_UPLOADER}} -h $host --port $port -u ${{secrets.SFTP_USER}} -p ${{secrets.SFTP_PASSWORD}} --base $base_path -s $source
80+
run: dotnet ./dev/${{env.SFTP_UPLOADER}} ftp --host $host --port $port -u ${{secrets.SFTP_USER}} -p ${{secrets.SFTP_PASSWORD}} --base $base_path -s $source
8181
env:
8282
host: republicatwar.com
8383
port: 1579

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
55
<PrivateAssets>all</PrivateAssets>
6-
<Version>3.7.115</Version>
6+
<Version>3.9.50</Version>
77
</PackageReference>
88
</ItemGroup>
99
</Project>

‎ModVerify‎

Submodule ModVerify updated 158 files

‎ModdingToolBase‎

Submodule ModdingToolBase updated 61 files

‎RawDevTools.sln‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.6.33626.354
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.4.11519.219 insiders
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevLauncher", "src\DevLauncher\DevLauncher.csproj", "{1BA491BC-2CD6-4270-9573-5FF9529D8D89}"
77
EndProject
@@ -39,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PG.StarWarsGame.Files.ALO",
3939
EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PG.StarWarsGame.Engine", "ModVerify\src\PetroglyphTools\PG.StarWarsGame.Engine\PG.StarWarsGame.Engine.csproj", "{301A0BA8-303F-415E-A961-4755FB3978D8}"
4141
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModVerify.CliApp", "ModVerify\src\ModVerify.CliApp\ModVerify.CliApp.csproj", "{C5703F53-DC3D-4B4E-9E18-365124C72793}"
43-
EndProject
4442
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawDevTools", "src\RawDevTools\RawDevTools.csproj", "{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}"
4543
EndProject
4644
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextCompile", "src\TextCompile\TextCompile.csproj", "{50E34854-BF6B-4170-BB4C-74830AB5609B}"
@@ -113,10 +111,6 @@ Global
113111
{301A0BA8-303F-415E-A961-4755FB3978D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
114112
{301A0BA8-303F-415E-A961-4755FB3978D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
115113
{301A0BA8-303F-415E-A961-4755FB3978D8}.Release|Any CPU.Build.0 = Release|Any CPU
116-
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117-
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Debug|Any CPU.Build.0 = Debug|Any CPU
118-
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Release|Any CPU.ActiveCfg = Release|Any CPU
119-
{C5703F53-DC3D-4B4E-9E18-365124C72793}.Release|Any CPU.Build.0 = Release|Any CPU
120114
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121115
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
122116
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -163,7 +157,6 @@ Global
163157
{D6AC444F-5CC4-4DAC-B974-E3E64B9761A3} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
164158
{94267A81-F31C-4381-9E2B-868C0AC0E65A} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
165159
{301A0BA8-303F-415E-A961-4755FB3978D8} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
166-
{C5703F53-DC3D-4B4E-9E18-365124C72793} = {D4C9B8AA-96E5-49F4-B8A4-765144E16548}
167160
{50E34854-BF6B-4170-BB4C-74830AB5609B} = {5A7785E7-C59E-4F2D-9596-352844693272}
168161
{BB759AD8-EEAC-4994-80A8-34E60B2FDA86} = {5A7785E7-C59E-4F2D-9596-352844693272}
169162
{846253D9-D766-8852-74B9-E1E04B9F2A81} = {3E986062-E81F-4833-A127-24FA73FBCB1B}

‎src/DevLauncher.Tests/DevLauncher.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.4">
13+
<PackageReference Include="coverlet.collector" Version="8.0.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
18-
<PackageReference Include="Testably.Abstractions.Testing" Version="4.0.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
18+
<PackageReference Include="Testably.Abstractions.Testing" Version="5.3.0" />
1919
<PackageReference Include="xunit" Version="2.9.3" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

‎src/DevLauncher/DevLauncher.csproj‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="CompuMaster.Text.Diff" Version="2024.11.4.100" />
23-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
22+
<PackageReference Include="CompuMaster.Text.Diff" Version="2025.12.29" />
23+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
2424
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
2525
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
26-
<PackageReference Include="AlamoEngineTools.SteamAbstraction" Version="4.0.35" />
27-
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.8" />
26+
<PackageReference Include="AlamoEngineTools.SteamAbstraction" Version="5.0.1" />
27+
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="13.0.1" />
2828
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
29-
<PackageReference Include="Antlr4BuildTasks" Version="12.10.0" />
30-
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.3.8" />
29+
<PackageReference Include="Antlr4BuildTasks" Version="12.14.0" />
30+
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="13.0.1" />
3131
<PackageReference Include="Glob" Version="1.1.9" />
3232
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
3333
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
@@ -38,20 +38,28 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="IndexRange" Version="1.0.3">
41+
<PackageReference Include="PolySharp" Version="1.15.0">
4242
<PrivateAssets>all</PrivateAssets>
4343
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4444
</PackageReference>
45-
<PackageReference Include="PolySharp" Version="1.15.0">
46-
<PrivateAssets>all</PrivateAssets>
45+
</ItemGroup>
46+
47+
<!-- Exclude System.Index from all dependencies, excluding Microsoft.Bcl.Memory -->
48+
<ItemGroup>
49+
<PackageReference Include="Vanara.Core" Version="5.0.0">
50+
<ExcludeAssets>compile</ExcludeAssets>
51+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
52+
</PackageReference>
53+
<PackageReference Include="IndexRange" Version="1.0.3">
54+
<ExcludeAssets>compile</ExcludeAssets>
4755
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4856
</PackageReference>
57+
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.3"/>
4958
</ItemGroup>
5059

5160
<ItemGroup>
5261
<ProjectReference Include="..\..\ModdingToolBase\src\AnakinApps\ApplicationBase.CommandLine\ApplicationBase.CommandLine.csproj" />
5362
<ProjectReference Include="..\..\ModdingToolBase\src\Updater\AppUpdaterFramework.Manifest\AppUpdaterFramework.Manifest.csproj" />
54-
<ProjectReference Include="..\..\ModVerify\src\ModVerify\ModVerify.csproj" />
5563
<ProjectReference Include="..\..\ModVerify\src\PetroglyphTools\PG.StarWarsGame.Engine\PG.StarWarsGame.Engine.csproj" />
5664
<ProjectReference Include="..\..\ModVerify\src\PetroglyphTools\PG.StarWarsGame.Files.ALO\PG.StarWarsGame.Files.ALO.csproj" />
5765
<ProjectReference Include="..\RawDevTools\RawDevTools.csproj" />

‎src/DevLauncher/DevLauncherEnvironment.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77

88
namespace RepublicAtWar.DevLauncher;
99

10-
internal class DevLauncherEnvironment(Assembly assembly, IFileSystem fileSystem) : UpdatableApplicationEnvironment(assembly, fileSystem)
10+
internal class DevLauncherEnvironment(Assembly assembly, IFileSystem fileSystem)
11+
: UpdatableApplicationEnvironment(assembly, fileSystem)
1112
{
1213
private const string ToolPathName = "RawDevLauncher";
1314

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

16-
public override Uri? RepositoryUrl => null;
17-
1817
public override ICollection<Uri> UpdateMirrors { get; } = new List<Uri>
1918
{
2019
new($"https://republicatwar.com/downloads/{ToolPathName}")

‎src/DevLauncher/Options/VerifyOption.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/DevLauncher/Pipelines/Actions/CreateLocalizationDiffsAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected override void RunAction(CancellationToken cancellationToken)
4444
if (locFile.Language == LanguageType.English)
4545
continue;
4646

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

4949
var masterText = _localizationFileService.CreateModelFromLocalizationFile(locFile);
5050

0 commit comments

Comments
 (0)