diff --git a/ModVerify b/ModVerify index 4eb6a1c..554b0fb 160000 --- a/ModVerify +++ b/ModVerify @@ -1 +1 @@ -Subproject commit 4eb6a1c0567b68c6a0f858426c478c7572f4d81c +Subproject commit 554b0fb61280b2cec7225832c21cfaebfc6c56f8 diff --git a/ModdingToolBase b/ModdingToolBase index e12f6ce..da072f4 160000 --- a/ModdingToolBase +++ b/ModdingToolBase @@ -1 +1 @@ -Subproject commit e12f6ceedb83fe9e3372dd89c68d508f8479cf92 +Subproject commit da072f43e6b85aab35b43d11f6b36eab61bdcfa6 diff --git a/src/DevLauncher.Tests/DevLauncher.Tests.csproj b/src/DevLauncher.Tests/DevLauncher.Tests.csproj index a54378b..8ff8e60 100644 --- a/src/DevLauncher.Tests/DevLauncher.Tests.csproj +++ b/src/DevLauncher.Tests/DevLauncher.Tests.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -10,14 +10,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/DevLauncher/DevLauncher.csproj b/src/DevLauncher/DevLauncher.csproj index 6f7f992..e8b5dc7 100644 --- a/src/DevLauncher/DevLauncher.csproj +++ b/src/DevLauncher/DevLauncher.csproj @@ -23,11 +23,11 @@ - - + + - + @@ -46,7 +46,7 @@ - + compile runtime; build; native; contentfiles; analyzers; buildtransitive @@ -54,7 +54,7 @@ compile runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/DevLauncher/Pipelines/ReleaseRawPipeline.cs b/src/DevLauncher/Pipelines/ReleaseRawPipeline.cs index 1936d5b..cc82138 100644 --- a/src/DevLauncher/Pipelines/ReleaseRawPipeline.cs +++ b/src/DevLauncher/Pipelines/ReleaseRawPipeline.cs @@ -1,5 +1,4 @@ -using AET.Modinfo.Model; -using AnakinRaW.CommonUtilities.SimplePipeline; +using AnakinRaW.CommonUtilities.SimplePipeline; using AnakinRaW.CommonUtilities.SimplePipeline.Steps; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/src/DevLauncher/Program.cs b/src/DevLauncher/Program.cs index 50944ba..067ff92 100644 --- a/src/DevLauncher/Program.cs +++ b/src/DevLauncher/Program.cs @@ -14,7 +14,6 @@ using Microsoft.Extensions.Logging; using PG.Commons; using PG.StarWarsGame.Engine; -using PG.StarWarsGame.Engine.Xml.Parsers; using PG.StarWarsGame.Files.ALO; using PG.StarWarsGame.Files.DAT; using PG.StarWarsGame.Files.MEG; @@ -35,6 +34,7 @@ using System.IO.Abstractions; using System.Reflection; using System.Threading.Tasks; +using PG.StarWarsGame.Engine.Xml; using Testably.Abstractions; using ILogger = Serilog.ILogger; @@ -52,8 +52,8 @@ public static Task Main(string[] args) internal class Program : SelfUpdateableAppLifecycle { - private static readonly string EngineParserNamespace = typeof(XmlObjectParser<>).Namespace!; - private static readonly string ParserNamespace = typeof(PetroglyphXmlFileParser<>).Namespace!; + private static readonly string EngineParserNamespace = typeof(PetroglyphStarWarsGameXmlParser).Namespace!; + private static readonly string ParserNamespace = typeof(XmlFileParser<>).Namespace!; private static readonly string DevLauncherRootNamespace = typeof(Program).Namespace!; private static readonly string DevLauncherUpdateNamespace = typeof(RawDevLauncherUpdater).Namespace!; diff --git a/src/DevLauncher/Properties/launchSettings.json b/src/DevLauncher/Properties/launchSettings.json index e517f5d..cbe0893 100644 --- a/src/DevLauncher/Properties/launchSettings.json +++ b/src/DevLauncher/Properties/launchSettings.json @@ -5,11 +5,11 @@ "commandLineArgs": "--verboseBootstrapLogging -verbose", "workingDirectory": "C:\\Privat\\Steam\\steamapps\\common\\Star Wars Empire at War\\corruption\\Mods\\republic-at-war" }, - "DAT2LocFile": { - "commandName": "Project", - "commandLineArgs": "initLoc --skipUpdate", - "workingDirectory": "C:\\Privat\\Steam\\steamapps\\common\\Star Wars Empire at War\\corruption\\Mods\\republic-at-war" - }, + //"DAT2LocFile": { + // "commandName": "Project", + // "commandLineArgs": "initLoc --skipUpdate", + // "workingDirectory": "C:\\Privat\\Steam\\steamapps\\common\\Star Wars Empire at War\\corruption\\Mods\\republic-at-war" + //}, "Diff Localizations": { "commandName": "Project", "commandLineArgs": "prepareLoc --skipUpdate", diff --git a/src/MegCompile/MegCompile.csproj b/src/MegCompile/MegCompile.csproj index b319200..262957e 100644 --- a/src/MegCompile/MegCompile.csproj +++ b/src/MegCompile/MegCompile.csproj @@ -16,18 +16,18 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/RawDevTools/RawDevTools.csproj b/src/RawDevTools/RawDevTools.csproj index b47feff..be8bd86 100644 --- a/src/RawDevTools/RawDevTools.csproj +++ b/src/RawDevTools/RawDevTools.csproj @@ -43,13 +43,13 @@ - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/TextCompile/TextCompile.csproj b/src/TextCompile/TextCompile.csproj index e060ac5..6c77460 100644 --- a/src/TextCompile/TextCompile.csproj +++ b/src/TextCompile/TextCompile.csproj @@ -15,18 +15,18 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + +