Skip to content
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.

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

New Release #19

Merged
merged 70 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
bf0207d
use costura only for release mode
AnakinRaW Jun 1, 2024
716de67
use variable version from file
AnakinRaW Jun 1, 2024
e1b8c61
commit to switch devices
AnakinRaW Jun 2, 2024
a68af05
update subs
AnakinRaW Jun 2, 2024
4da3fdd
update subs
AnakinRaW Jun 3, 2024
9bc00e3
add primitive wav file check
AnakinRaW Jun 3, 2024
d3facf1
update subs
AnakinRaW Jun 8, 2024
fe8729b
update deps and subs
AnakinRaW Jun 9, 2024
f1a8d2e
update sub
AnakinRaW Jun 13, 2024
61e0e39
update deps
AnakinRaW Jun 13, 2024
df2fcac
update subs
AnakinRaW Jun 13, 2024
e97b433
extract code and create megpack tool
AnakinRaW Jun 14, 2024
366fece
error message improved
AnakinRaW Jun 15, 2024
0a92c68
add text compile app
AnakinRaW Jun 15, 2024
d1ed1dc
update sub
AnakinRaW Jun 15, 2024
873ca54
update sub
AnakinRaW Jun 16, 2024
b620cb4
start extracting code out of launcher app
AnakinRaW Jun 16, 2024
53da0e2
update sub
AnakinRaW Jun 16, 2024
9c0c1e5
update sub
AnakinRaW Jun 16, 2024
51c8436
start extracting code
AnakinRaW Jun 16, 2024
2848338
extract code
AnakinRaW Jun 21, 2024
5439a61
implement logging for xml parsers
AnakinRaW Jun 22, 2024
104c6df
update modules
AnakinRaW Jun 22, 2024
2086129
fix logging
AnakinRaW Jun 22, 2024
bf9a1f8
reorganize xml parsing
AnakinRaW Jun 22, 2024
3955dbb
update subs
AnakinRaW Jun 22, 2024
e90e639
start parse sfxevents
AnakinRaW Jul 2, 2024
3a52532
updarte subs
AnakinRaW Jul 2, 2024
779ff4c
update diffs layout
AnakinRaW Jul 3, 2024
7b2223e
parse sfxevent
AnakinRaW Jul 6, 2024
5e0c60b
update sub
AnakinRaW Jul 6, 2024
dacfe97
add reporting and other stuff
AnakinRaW Jul 20, 2024
2961b12
update module
AnakinRaW Jul 20, 2024
1749108
Merge branch 'develop' of https://github.com/AnakinRaW/RaWDevTools in…
AnakinRaW Jul 20, 2024
fdda721
update subs
AnakinRaW Jul 21, 2024
10f8e21
update sub
AnakinRaW Jul 21, 2024
fc1b50f
update sub
AnakinRaW Jul 22, 2024
901485f
update sub
AnakinRaW Jul 24, 2024
0e69c0e
update subs
AnakinRaW Jul 24, 2024
3a361da
udpate sub
AnakinRaW Aug 3, 2024
3d5ba37
update deps
AnakinRaW Aug 3, 2024
e167b36
update subs
AnakinRaW Aug 3, 2024
51de36d
update sub
AnakinRaW Aug 3, 2024
ca10d79
update sub
AnakinRaW Aug 3, 2024
2b7b02b
update subs
AnakinRaW Aug 3, 2024
25f9b76
update dep
AnakinRaW Aug 3, 2024
01284a6
udpate deps and subs
AnakinRaW Aug 10, 2024
c384911
update subs
AnakinRaW Aug 15, 2024
66eda01
update subs
AnakinRaW Aug 15, 2024
43905c9
update sub
AnakinRaW Aug 15, 2024
56a0485
remove valuelistdict to xml objects to avoid boxing
AnakinRaW Sep 12, 2024
18ab5cc
update deps
AnakinRaW Sep 24, 2024
641b28b
update dep
AnakinRaW Sep 24, 2024
35ae839
use spans for repositories
AnakinRaW Sep 24, 2024
be12251
correction
AnakinRaW Oct 4, 2024
5b236e3
Merge branch 'develop' of https://github.com/AnakinRaW/RaWDevTools in…
AnakinRaW Oct 4, 2024
487bbc5
update deps and sub
AnakinRaW Oct 4, 2024
70d7f2c
Merge branch 'develop' of https://github.com/AnakinRaW/RaWDevTools in…
AnakinRaW Oct 4, 2024
e2c01cd
update sub
AnakinRaW Oct 4, 2024
6098d72
update sub
AnakinRaW Oct 4, 2024
3ff5fa5
fix some files are not found.
AnakinRaW Oct 4, 2024
00f8c0f
extract constants
AnakinRaW Oct 4, 2024
3d5a69b
implement parsing commandbar components (except colors)
AnakinRaW Oct 5, 2024
18d756a
move code
AnakinRaW Oct 11, 2024
56839db
update sub
AnakinRaW Oct 11, 2024
c913365
update modules
AnakinRaW Feb 3, 2025
fd7b0bf
update subs
AnakinRaW Feb 3, 2025
08b1af3
update deps and make compile again
AnakinRaW Feb 3, 2025
a055ed8
update sub
AnakinRaW Feb 3, 2025
4fa367f
fix release build
AnakinRaW Feb 3, 2025
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/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
submodules: recursive
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Build in Release Mode
run: dotnet build --configuration Release
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x
- name: Build
run: dotnet build ${{ env.TOOL_PROJ_PATH }} --configuration Release --output ./binaries
- name: Upload a Build Artifact
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x
- uses: actions/download-artifact@v4
with:
name: Build Artifacts
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
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.6.133</Version>
<Version>3.7.115</Version>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ModVerify
Submodule ModVerify updated 246 files
2 changes: 1 addition & 1 deletion ModdingToolBase
Submodule ModdingToolBase updated 47 files
+3 −3 src/AnakinApps/ApplicationBase.CLI/ApplicationBase.CLI.csproj
+27 −3 src/AnakinApps/ApplicationBase.CLI/CliBootstrapper.cs
+2 −2 src/AnakinApps/ApplicationBase.WPF/ApplicationBase.WPF.csproj
+3 −2 src/AnakinApps/ApplicationBase.WPF/ViewModels/Designer/DesignerKillProcessDialogViewModel.cs
+8 −8 src/AnakinApps/ApplicationBase/ApplicationBase.csproj
+0 −17 src/AnakinApps/ApplicationBase/ApplicationDownloadConfigurationProvider.cs
+9 −0 src/AnakinApps/ApplicationBase/ApplicationEnvironmentBase.cs
+2 −5 src/AnakinApps/ApplicationBase/BootstrapperBase.cs
+3 −0 src/AnakinApps/ApplicationBase/IApplicationEnvironment.cs
+4 −20 src/AnakinApps/ApplicationBase/Services/ApplicationUpdaterRegistry.cs
+0 −5 src/AnakinApps/ApplicationBase/Services/ExternalUpdateExtractor.cs
+8 −0 src/AnakinApps/ApplicationBase/Services/IExternalUpdateExtractor.cs
+1 −1 src/AnakinApps/ApplicationBase/Services/UnhandledExceptionHandler.cs
+4 −1 src/AnakinApps/ApplicationBase/Update/ApplicationBranchManager.cs
+2 −1 src/AnakinApps/ApplicationBase/Update/ApplicationUpdateConfigurationProvider.cs
+10 −7 src/AnakinApps/ApplicationConstants/ApplicationBranchUtilities.cs
+3 −1 src/AnakinApps/ApplicationManifestCreator/AppManifestCreatorBranchManager.cs
+7 −7 src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj
+2 −3 src/AnakinApps/ApplicationManifestCreator/Program.cs
+8 −8 src/AnakinApps/FtpUploader/FtpUploader.csproj
+3 −1 src/AnakinApps/FtpUploader/Program.cs
+5 −5 src/CommonUtilities/CommonUtilities.WPF.ApplicationFramework/CommonUtilities.WPF.ApplicationFramework.csproj
+5 −5 src/CommonUtilities/CommonUtilities.WPF.Controls/CommonUtilities.WPF.Controls.csproj
+1 −1 src/CommonUtilities/CommonUtilities.WPF.Controls/Utilities/EnumerableModificationDetector.cs
+1 −1 src/CommonUtilities/CommonUtilities.WPF.Controls/Utilities/SuspendableObservableCollection.cs
+7 −7 src/CommonUtilities/CommonUtilities.WPF.Core/CommonUtilities.WPF.Core.csproj
+3 −3 src/CommonUtilities/CommonUtilities.WPF.Imaging/CommonUtilities.WPF.Imaging.csproj
+2 −2 src/CommonUtilities/CommonUtilities.Windows/CommonUtilities.Windows.csproj
+4 −4 src/Updater/AppUpdaterFramework.Core/AppUpdaterFramework.Core.csproj
+2 −2 src/Updater/AppUpdaterFramework.Manifest/AppUpdaterFramework.Manifest.csproj
+2 −2 src/Updater/AppUpdaterFramework.WPF/AppUpdaterFramework.WPF.csproj
+2 −2 src/Updater/AppUpdaterFramework.WPF/ViewModels/Progress/DownloadingProgressBarViewModel.cs
+1 −1 src/Updater/AppUpdaterFramework.WPF/ViewModels/Progress/InstallingProgressBarViewModel.cs
+9 −9 src/Updater/AppUpdaterFramework/AppUpdaterFramework.csproj
+2 −24 src/Updater/AppUpdaterFramework/Configuration/IUpdateConfiguration.cs
+31 −0 src/Updater/AppUpdaterFramework/Configuration/UpdateConfiguration.cs
+4 −1 src/Updater/AppUpdaterFramework/Product/Manifest/ManifestDownloader.cs
+59 −39 src/Updater/AppUpdaterFramework/Updater/Internal/UpdatePipeline.cs
+9 −7 src/Updater/AppUpdaterFramework/Updater/Progress/AggregatedDownloadProgressReporter.cs
+9 −5 src/Updater/AppUpdaterFramework/Updater/Progress/AggregatedInstallProgressReporter.cs
+6 −3 src/Updater/AppUpdaterFramework/Updater/Progress/ComponentAggregatedProgressReporter.cs
+5 −5 src/Updater/AppUpdaterFramework/Updater/Tasks/DownloadStep.cs
+1 −1 src/Updater/Directory.Build.props
+5 −5 src/Updater/ExternalUpdater.CLI/ExternalUpdater.CLI.csproj
+8 −8 src/Updater/ExternalUpdater/ExternalUpdater.csproj
+39 −4 src/Updater/ExternalUpdater/FodyWeavers.xsd
+2 −1 src/Updater/ExternalUpdater/Program.cs
Binary file added RAW.ico
Binary file not shown.
39 changes: 20 additions & 19 deletions RawDevTools.sln
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ 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}") = "PG.Commons", "ModVerify\PetroglyphTools\PG.Commons\PG.Commons\PG.Commons.csproj", "{FBD44E55-3CFC-46BF-B1CA-137EBBD0CF61}"
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}") = "PG.StarWarsGame.Files.DAT", "ModVerify\PetroglyphTools\PG.StarWarsGame.Files.DAT\PG.StarWarsGame.Files.DAT\PG.StarWarsGame.Files.DAT.csproj", "{AA9ED765-5075-43A6-B2FE-73EFB3C9FE26}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawDevTools", "src\RawDevTools\RawDevTools.csproj", "{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PG.StarWarsGame.Files.MEG", "ModVerify\PetroglyphTools\PG.StarWarsGame.Files.MEG\PG.StarWarsGame.Files.MEG\PG.StarWarsGame.Files.MEG.csproj", "{46040394-C2B9-4002-8083-9FEDD0BF115B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextCompile", "src\TextCompile\TextCompile.csproj", "{50E34854-BF6B-4170-BB4C-74830AB5609B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModVerify.CliApp", "ModVerify\src\ModVerify.CliApp\ModVerify.CliApp.csproj", "{C5703F53-DC3D-4B4E-9E18-365124C72793}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MegCompile", "src\MegCompile\MegCompile.csproj", "{BB759AD8-EEAC-4994-80A8-34E60B2FDA86}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SeparatedTools", "SeparatedTools", "{5A7785E7-C59E-4F2D-9596-352844693272}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -127,22 +129,22 @@ 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
{FBD44E55-3CFC-46BF-B1CA-137EBBD0CF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBD44E55-3CFC-46BF-B1CA-137EBBD0CF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBD44E55-3CFC-46BF-B1CA-137EBBD0CF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBD44E55-3CFC-46BF-B1CA-137EBBD0CF61}.Release|Any CPU.Build.0 = Release|Any CPU
{AA9ED765-5075-43A6-B2FE-73EFB3C9FE26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA9ED765-5075-43A6-B2FE-73EFB3C9FE26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA9ED765-5075-43A6-B2FE-73EFB3C9FE26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA9ED765-5075-43A6-B2FE-73EFB3C9FE26}.Release|Any CPU.Build.0 = Release|Any CPU
{46040394-C2B9-4002-8083-9FEDD0BF115B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46040394-C2B9-4002-8083-9FEDD0BF115B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46040394-C2B9-4002-8083-9FEDD0BF115B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46040394-C2B9-4002-8083-9FEDD0BF115B}.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
{E4F63116-B94A-43FB-ABA9-B9D491D9F6D9}.Release|Any CPU.Build.0 = Release|Any CPU
{50E34854-BF6B-4170-BB4C-74830AB5609B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50E34854-BF6B-4170-BB4C-74830AB5609B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50E34854-BF6B-4170-BB4C-74830AB5609B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50E34854-BF6B-4170-BB4C-74830AB5609B}.Release|Any CPU.Build.0 = Release|Any CPU
{BB759AD8-EEAC-4994-80A8-34E60B2FDA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB759AD8-EEAC-4994-80A8-34E60B2FDA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB759AD8-EEAC-4994-80A8-34E60B2FDA86}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB759AD8-EEAC-4994-80A8-34E60B2FDA86}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -166,10 +168,9 @@ 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}
{FBD44E55-3CFC-46BF-B1CA-137EBBD0CF61} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
{AA9ED765-5075-43A6-B2FE-73EFB3C9FE26} = {FF4C3704-0C74-40B5-A38D-AF29B6385D85}
{46040394-C2B9-4002-8083-9FEDD0BF115B} = {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}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DC15751A-BB36-4EF1-BFF0-2DF1E419AC8F}
Expand Down
12 changes: 6 additions & 6 deletions src/DevLauncher.Tests/DevLauncher.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -10,14 +10,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Testably.Abstractions.Testing" Version="3.2.1" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Testably.Abstractions.Testing" Version="4.0.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
42 changes: 21 additions & 21 deletions src/DevLauncher.Tests/LocalizationParserTest.cs
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using RepublicAtWar.DevLauncher.Localization;
using PG.StarWarsGame.Engine;
using PG.StarWarsGame.Engine.Localization;
using RepublicAtWar.DevTools.Localization;
using Testably.Abstractions.Testing;

namespace DevLauncher.Tests;

public class LocalizationParserTest
{
private readonly MockFileSystem _fileSystem = new();
private readonly LocalizationFileReader _reader;
private readonly IServiceProvider _serviceProvider;

public LocalizationParserTest()
{
var sc = new ServiceCollection();
sc.AddSingleton<IFileSystem>(_fileSystem);
_reader = new LocalizationFileReader(false, sc.BuildServiceProvider());
PetroglyphEngineServiceContribution.ContributeServices(sc);
_serviceProvider = sc.BuildServiceProvider();
}

private void Setup(string text)
private LocalizationFileReader Setup(string text)
{
_fileSystem.Initialize().WithFile("textFile.txt").Which(a => a.HasStringContent(text));
_fileSystem.Initialize().WithFile("textFile.txt")
.Which(a => a.HasStringContent(text));
return new LocalizationFileReader("textFile.txt", false, _serviceProvider);
}


Expand All @@ -32,8 +38,7 @@ private void Setup(string text)
[InlineData("LANGUAGE=ENGLISH")]
public void Test_InvalidText_Language(string text)
{
Setup(text);
Assert.Throws<SyntaxErrorException>(() => _reader.ReadFile("textFile.txt"));
Assert.Throws<SyntaxErrorException>(Setup(text).Read);
}

[Fact]
Expand All @@ -43,8 +48,7 @@ public void Test_ReadFile_Invalid_EmptyValue1()
LANGUAGE='LANG';
key=
";
Setup(text);
Assert.Throws<SyntaxErrorException>(() => _reader.ReadFile("textFile.txt"));
Assert.Throws<SyntaxErrorException>(Setup(text).Read);
}

[Fact]
Expand All @@ -55,8 +59,7 @@ public void Test_ReadFile_Invalid_EmptyValue2()
key=
key=""""
";
Setup(text);
Assert.Throws<SyntaxErrorException>(() => _reader.ReadFile("textFile.txt"));
Assert.Throws<SyntaxErrorException>(Setup(text).Read);
}

[Fact]
Expand All @@ -67,8 +70,7 @@ public void Test_ReadFile_Invalid_AmbiguousQuoteValue()
quoteOnly=""This value is interpreted as DQString
leadingQuotes=""""key\=123 value
";
Setup(text);
Assert.Throws<SyntaxErrorException>(() => _reader.ReadFile("textFile.txt"));
Assert.Throws<SyntaxErrorException>(() => Setup(text).Read());
}

[Fact]
Expand All @@ -79,17 +81,16 @@ public void Test_ReadFile_DuplicateKey_Throws()
key=value
key=value1
";
Setup(text);
Assert.Throws<InvalidLocalizationFileException>(() => _reader.ReadFile("textFile.txt"));
Assert.Throws<DuplicateKeysException>(() => Setup(text).Read());
}


[Fact]
public void Test_EmptyList()
{
Setup("LANGUAGE='ENGLISH';");
var localizationFile = _reader.ReadFile("textFile.txt");
Assert.Equal("ENGLISH", localizationFile.Language);
const string text = "LANGUAGE='ENGLISH';";
var localizationFile = Setup(text).Read();
Assert.Equal(LanguageType.English, localizationFile.Language);
Assert.Equal(new List<LocalizationEntry>(), localizationFile.Entries);
}

Expand Down Expand Up @@ -119,9 +120,8 @@ and a line break""
trailingSpace=""dqstring with trailing space should get ignored""
";

Setup(text);
var localizationFile = _reader.ReadFile("textFile.txt");
Assert.Equal("ENGLISH", localizationFile.Language);
var localizationFile = Setup(text).Read();
Assert.Equal(LanguageType.English, localizationFile.Language);
Assert.Equal(new List<LocalizationEntry>
{
new("test123", @"test string # with "" all "" sorts of ' special = characters and a line break"),
Expand Down
81 changes: 27 additions & 54 deletions src/DevLauncher/DevLauncher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,72 +19,45 @@
</PropertyGroup>

<ItemGroup>
<None Remove="Localization\LocalizationGrammar.g4" />
<None Remove="Resources\DummyMasterTextFile.xml" />
<None Remove="Resources\ModCompile.exe" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\ModCompile.exe" />
<EmbeddedResource Include="Resources\DummyMasterTextFile.xml" />
</ItemGroup>

<ItemGroup>
<Antlr4 Include="Localization\LocalizationGrammar.g4">
<Listener>true</Listener>
<Visitor>true</Visitor>
<GAtn>false</GAtn>
<Error>true</Error>
</Antlr4>
</ItemGroup>

<ItemGroup>
<Content Include="RAW.ico" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Infrastructure.Clients" Version="3.1.5" />
<PackageReference Include="AlamoEngineTools.SteamAbstraction" Version="3.1.5" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.0.2-beta" />
<PackageReference Include="AnakinRaW.CommonUtilities.Xml" Version="12.0.2-beta" />
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />

<PackageReference Include="AlamoEngineTools.SteamAbstraction" Version="4.0.26" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.0.91" />
<PackageReference Include="AnakinRaW.CommonUtilities.Xml" Version="12.0.25-beta" />
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageReference Include="Antlr4BuildTasks" Version="12.8.0" />
<PackageReference Include="Costura.Fody" Version="5.7.0">
<PackageReference Include="Costura.Fody" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.0.2-beta" />
<PackageReference Include="Glob" Version="1.1.9" />
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.0.91" />
<PackageReference Include="Glob" Version="1.1.9" />
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="LibGit2Sharp" Version="0.30.0" />
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
<PackageReference Include="Required" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\ModdingToolBase\src\AnakinApps\ApplicationBase.CLI\ApplicationBase.CLI.csproj" />
<ProjectReference Include="..\..\ModdingToolBase\src\Updater\ExternalUpdater\ExternalUpdater.csproj" />
<ProjectReference Include="..\..\ModVerify\PetroglyphTools\PG.Commons\PG.Commons\PG.Commons.csproj" />
<ProjectReference Include="..\..\ModVerify\PetroglyphTools\PG.StarWarsGame.Files.DAT\PG.StarWarsGame.Files.DAT\PG.StarWarsGame.Files.DAT.csproj" />
<ProjectReference Include="..\..\ModVerify\PetroglyphTools\PG.StarWarsGame.Files.MEG\PG.StarWarsGame.Files.MEG\PG.StarWarsGame.Files.MEG.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" />
</ItemGroup>

<ItemGroup>
<Compile Update="Pipelines\Steps\Releasing\CopyReleaseStep.cs">
<CustomToolNamespace></CustomToolNamespace>
</Compile>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
<ProjectReference Include="..\..\ModdingToolBase\src\AnakinApps\ApplicationBase.CLI\ApplicationBase.CLI.csproj" />
<ProjectReference Include="..\..\ModdingToolBase\src\Updater\ExternalUpdater\ExternalUpdater.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" />
</ItemGroup>

<PropertyGroup>
<WeaverConfiguration Condition="'$(Configuration)' == 'Release'">
<Weavers>
<Costura IncludeDebugSymbols="false" IgnoreSatelliteAssemblies="true" />
</Weavers>
</WeaverConfiguration>
</PropertyGroup>

</Project>
1 change: 0 additions & 1 deletion src/DevLauncher/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura IncludeDebugSymbols="false" IgnoreSatelliteAssemblies="true"/>
</Weavers>
19 changes: 0 additions & 19 deletions src/DevLauncher/Localization/DuplicateKeysException.cs

This file was deleted.

6 changes: 0 additions & 6 deletions src/DevLauncher/Localization/ILocalizationFileReader.cs

This file was deleted.

Loading
Loading