From 494c2724fcc71955cc4985adcbc58accd5cbf7e4 Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Thu, 3 Apr 2025 09:54:27 +0100 Subject: [PATCH] tools: merge config tool projects This merges the three config tool projects into a single VS solution. --- tools/config/.gitignore | 1 + .../{tr1 => }/config/TR1X_ConfigTool/App.xaml | 0 .../config/TR1X_ConfigTool/App.xaml.cs | 0 .../Resources/Graphics/graphic1.jpg | Bin .../Resources/Graphics/graphic2.jpg | Bin .../Resources/Graphics/graphic3.jpg | Bin .../Resources/Graphics/graphic4.jpg | Bin .../Resources/Graphics/graphic5.jpg | Bin .../Resources/Graphics/graphic6.jpg | Bin .../Resources/Graphics/graphic7.jpg | Bin .../TR1X_ConfigTool/Resources/Lang/en-GB.json | 0 .../TR1X_ConfigTool/Resources/Lang/en.json | 0 .../TR1X_ConfigTool/Resources/Lang/es.json | 0 .../TR1X_ConfigTool/Resources/Lang/fr.json | 0 .../TR1X_ConfigTool/Resources/Lang/it.json | 0 .../config/TR1X_ConfigTool/Resources/TR1X.png | Bin .../TR1X_ConfigTool/Resources/const.json | 0 .../config/TR1X_ConfigTool/Resources/icon.ico | Bin .../Resources/specification.json | 0 .../TR1X_ConfigTool/TR1X_ConfigTool.csproj | 7 ++-- .../config/TR1X_ConfigTool/app.manifest | 0 .../{tr2 => }/config/TR2X_ConfigTool/App.xaml | 0 .../config/TR2X_ConfigTool/App.xaml.cs | 0 .../Resources/Graphics/graphic1.jpg | Bin .../Resources/Graphics/graphic2.jpg | Bin .../Resources/Graphics/graphic3.jpg | Bin .../Resources/Graphics/graphic4.jpg | Bin .../Resources/Graphics/graphic5.jpg | Bin .../Resources/Graphics/graphic6.jpg | Bin .../Resources/Graphics/graphic7.jpg | Bin .../TR2X_ConfigTool/Resources/Lang/en.json | 0 .../TR2X_ConfigTool/Resources/Lang/it.json | 0 .../config/TR2X_ConfigTool/Resources/TR2X.png | Bin .../TR2X_ConfigTool/Resources/const.json | 0 .../config/TR2X_ConfigTool/Resources/icon.ico | Bin .../Resources/specification.json | 0 .../TR2X_ConfigTool/TR2X_ConfigTool.csproj | 7 ++-- .../config/TR2X_ConfigTool/app.manifest | 0 ...X_ConfigToolLib.sln => TRX_ConfigTool.sln} | 12 +++++++ .../TRX_ConfigToolLib.csproj | 1 + tools/shared/docker/config/entrypoint.sh | 10 +----- tools/shared/docker/game_entrypoint.py | 2 +- tools/shared/docker/installer/entrypoint.sh | 1 - tools/tr1/config/.gitignore | 4 --- tools/tr1/config/TR1X_ConfigTool.sln | 31 ------------------ tools/tr2/config/.gitignore | 16 --------- tools/tr2/config/TR2X_ConfigTool.sln | 30 ----------------- 47 files changed, 24 insertions(+), 98 deletions(-) rename tools/{tr1 => }/config/TR1X_ConfigTool/App.xaml (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/App.xaml.cs (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Lang/en-GB.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Lang/en.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Lang/es.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Lang/fr.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/Lang/it.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/TR1X.png (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/const.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/icon.ico (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/Resources/specification.json (100%) rename tools/{tr1 => }/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj (94%) rename tools/{tr1 => }/config/TR1X_ConfigTool/app.manifest (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/App.xaml (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/App.xaml.cs (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Lang/en.json (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/Lang/it.json (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/TR2X.png (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/const.json (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/icon.ico (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/Resources/specification.json (100%) rename tools/{tr2 => }/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj (94%) rename tools/{tr2 => }/config/TR2X_ConfigTool/app.manifest (100%) rename tools/config/{TRX_ConfigToolLib.sln => TRX_ConfigTool.sln} (53%) delete mode 100644 tools/tr1/config/.gitignore delete mode 100644 tools/tr1/config/TR1X_ConfigTool.sln delete mode 100644 tools/tr2/config/.gitignore delete mode 100644 tools/tr2/config/TR2X_ConfigTool.sln diff --git a/tools/config/.gitignore b/tools/config/.gitignore index 7645b76b5..641a9bade 100644 --- a/tools/config/.gitignore +++ b/tools/config/.gitignore @@ -13,3 +13,4 @@ *.vcxproj *.filters *.pubxml +[Oo]ut/ diff --git a/tools/tr1/config/TR1X_ConfigTool/App.xaml b/tools/config/TR1X_ConfigTool/App.xaml similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/App.xaml rename to tools/config/TR1X_ConfigTool/App.xaml diff --git a/tools/tr1/config/TR1X_ConfigTool/App.xaml.cs b/tools/config/TR1X_ConfigTool/App.xaml.cs similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/App.xaml.cs rename to tools/config/TR1X_ConfigTool/App.xaml.cs diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg b/tools/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg rename to tools/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Lang/en-GB.json b/tools/config/TR1X_ConfigTool/Resources/Lang/en-GB.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Lang/en-GB.json rename to tools/config/TR1X_ConfigTool/Resources/Lang/en-GB.json diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Lang/en.json b/tools/config/TR1X_ConfigTool/Resources/Lang/en.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Lang/en.json rename to tools/config/TR1X_ConfigTool/Resources/Lang/en.json diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Lang/es.json b/tools/config/TR1X_ConfigTool/Resources/Lang/es.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Lang/es.json rename to tools/config/TR1X_ConfigTool/Resources/Lang/es.json diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Lang/fr.json b/tools/config/TR1X_ConfigTool/Resources/Lang/fr.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Lang/fr.json rename to tools/config/TR1X_ConfigTool/Resources/Lang/fr.json diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/Lang/it.json b/tools/config/TR1X_ConfigTool/Resources/Lang/it.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/Lang/it.json rename to tools/config/TR1X_ConfigTool/Resources/Lang/it.json diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/TR1X.png b/tools/config/TR1X_ConfigTool/Resources/TR1X.png similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/TR1X.png rename to tools/config/TR1X_ConfigTool/Resources/TR1X.png diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/const.json b/tools/config/TR1X_ConfigTool/Resources/const.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/const.json rename to tools/config/TR1X_ConfigTool/Resources/const.json diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/icon.ico b/tools/config/TR1X_ConfigTool/Resources/icon.ico similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/icon.ico rename to tools/config/TR1X_ConfigTool/Resources/icon.ico diff --git a/tools/tr1/config/TR1X_ConfigTool/Resources/specification.json b/tools/config/TR1X_ConfigTool/Resources/specification.json similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/Resources/specification.json rename to tools/config/TR1X_ConfigTool/Resources/specification.json diff --git a/tools/tr1/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj b/tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj similarity index 94% rename from tools/tr1/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj rename to tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj index e6a7a199a..0d84fae5b 100644 --- a/tools/tr1/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj +++ b/tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj @@ -66,8 +66,9 @@ - - ..\..\..\config\TRX_ConfigToolLib\bin\Release\publish\TRX_ConfigToolLib.dll - + + + + diff --git a/tools/tr1/config/TR1X_ConfigTool/app.manifest b/tools/config/TR1X_ConfigTool/app.manifest similarity index 100% rename from tools/tr1/config/TR1X_ConfigTool/app.manifest rename to tools/config/TR1X_ConfigTool/app.manifest diff --git a/tools/tr2/config/TR2X_ConfigTool/App.xaml b/tools/config/TR2X_ConfigTool/App.xaml similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/App.xaml rename to tools/config/TR2X_ConfigTool/App.xaml diff --git a/tools/tr2/config/TR2X_ConfigTool/App.xaml.cs b/tools/config/TR2X_ConfigTool/App.xaml.cs similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/App.xaml.cs rename to tools/config/TR2X_ConfigTool/App.xaml.cs diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg b/tools/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg rename to tools/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Lang/en.json b/tools/config/TR2X_ConfigTool/Resources/Lang/en.json similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Lang/en.json rename to tools/config/TR2X_ConfigTool/Resources/Lang/en.json diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/Lang/it.json b/tools/config/TR2X_ConfigTool/Resources/Lang/it.json similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/Lang/it.json rename to tools/config/TR2X_ConfigTool/Resources/Lang/it.json diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/TR2X.png b/tools/config/TR2X_ConfigTool/Resources/TR2X.png similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/TR2X.png rename to tools/config/TR2X_ConfigTool/Resources/TR2X.png diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/const.json b/tools/config/TR2X_ConfigTool/Resources/const.json similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/const.json rename to tools/config/TR2X_ConfigTool/Resources/const.json diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/icon.ico b/tools/config/TR2X_ConfigTool/Resources/icon.ico similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/icon.ico rename to tools/config/TR2X_ConfigTool/Resources/icon.ico diff --git a/tools/tr2/config/TR2X_ConfigTool/Resources/specification.json b/tools/config/TR2X_ConfigTool/Resources/specification.json similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/Resources/specification.json rename to tools/config/TR2X_ConfigTool/Resources/specification.json diff --git a/tools/tr2/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj b/tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj similarity index 94% rename from tools/tr2/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj rename to tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj index 60a418b0c..0c5ed5910 100644 --- a/tools/tr2/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj +++ b/tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj @@ -60,8 +60,9 @@ - - ..\..\..\config\TRX_ConfigToolLib\bin\Release\publish\TRX_ConfigToolLib.dll - + + + + diff --git a/tools/tr2/config/TR2X_ConfigTool/app.manifest b/tools/config/TR2X_ConfigTool/app.manifest similarity index 100% rename from tools/tr2/config/TR2X_ConfigTool/app.manifest rename to tools/config/TR2X_ConfigTool/app.manifest diff --git a/tools/config/TRX_ConfigToolLib.sln b/tools/config/TRX_ConfigTool.sln similarity index 53% rename from tools/config/TRX_ConfigToolLib.sln rename to tools/config/TRX_ConfigTool.sln index efff011e3..c756d9111 100644 --- a/tools/config/TRX_ConfigToolLib.sln +++ b/tools/config/TRX_ConfigTool.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 17.11.35219.272 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRX_ConfigToolLib", "TRX_ConfigToolLib\TRX_ConfigToolLib.csproj", "{27F08E8C-2910-4682-B8BC-96ED4C1ECE54}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TR1X_ConfigTool", "TR1X_ConfigTool\TR1X_ConfigTool.csproj", "{A19A8ED1-D703-4954-B0F2-8E651453EB3E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TR2X_ConfigTool", "TR2X_ConfigTool\TR2X_ConfigTool.csproj", "{9FAE4BC6-08E0-46AB-9E29-6FED79D60733}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +19,14 @@ Global {27F08E8C-2910-4682-B8BC-96ED4C1ECE54}.Debug|Any CPU.Build.0 = Debug|Any CPU {27F08E8C-2910-4682-B8BC-96ED4C1ECE54}.Release|Any CPU.ActiveCfg = Release|Any CPU {27F08E8C-2910-4682-B8BC-96ED4C1ECE54}.Release|Any CPU.Build.0 = Release|Any CPU + {A19A8ED1-D703-4954-B0F2-8E651453EB3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A19A8ED1-D703-4954-B0F2-8E651453EB3E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A19A8ED1-D703-4954-B0F2-8E651453EB3E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A19A8ED1-D703-4954-B0F2-8E651453EB3E}.Release|Any CPU.Build.0 = Release|Any CPU + {9FAE4BC6-08E0-46AB-9E29-6FED79D60733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FAE4BC6-08E0-46AB-9E29-6FED79D60733}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FAE4BC6-08E0-46AB-9E29-6FED79D60733}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FAE4BC6-08E0-46AB-9E29-6FED79D60733}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tools/config/TRX_ConfigToolLib/TRX_ConfigToolLib.csproj b/tools/config/TRX_ConfigToolLib/TRX_ConfigToolLib.csproj index 97545b5a8..42fc35259 100644 --- a/tools/config/TRX_ConfigToolLib/TRX_ConfigToolLib.csproj +++ b/tools/config/TRX_ConfigToolLib/TRX_ConfigToolLib.csproj @@ -5,6 +5,7 @@ true enable false + true diff --git a/tools/shared/docker/config/entrypoint.sh b/tools/shared/docker/config/entrypoint.sh index 3adc4f1a3..ea7fc3de4 100755 --- a/tools/shared/docker/config/entrypoint.sh +++ b/tools/shared/docker/config/entrypoint.sh @@ -12,14 +12,6 @@ export DOTNET_CLI_HOME="/tmp/DOTNET_CLI_HOME" echo $HOME shopt -s globstar -# Build the common lib DLL cd /app/tools/config/ -rm -rf **/bin **/obj -dotnet restore -p:EnableWindowsTargeting=true -dotnet publish -c Release -p:EnableWindowsTargeting=true - -# Build the main executable -cd /app/tools/tr${TR_VERSION}/config/ rm -rf **/bin **/obj **/out/* -dotnet restore -dotnet publish -c Release -o out +dotnet publish TR${TR_VERSION}X_ConfigTool -c Release -o out diff --git a/tools/shared/docker/game_entrypoint.py b/tools/shared/docker/game_entrypoint.py index 949c9ff3f..ea9334b30 100644 --- a/tools/shared/docker/game_entrypoint.py +++ b/tools/shared/docker/game_entrypoint.py @@ -65,7 +65,7 @@ class PackageOptions(BaseOptions): ), ( Path( - f"/app/tools/tr{self.tr_version}/config/out/TR{self.tr_version}X_ConfigTool.exe" + f"/app/tools/config/out/TR{self.tr_version}X_ConfigTool.exe" ), f"TR{self.tr_version}X_ConfigTool.exe", ), diff --git a/tools/shared/docker/installer/entrypoint.sh b/tools/shared/docker/installer/entrypoint.sh index 56ada8697..5c61ae708 100755 --- a/tools/shared/docker/installer/entrypoint.sh +++ b/tools/shared/docker/installer/entrypoint.sh @@ -14,5 +14,4 @@ export DOTNET_CLI_HOME="/tmp/DOTNET_CLI_HOME" shopt -s globstar rm -rf **/bin **/obj **/out/* -dotnet restore dotnet publish TR${TR_VERSION}X_Installer -c Release -o out diff --git a/tools/tr1/config/.gitignore b/tools/tr1/config/.gitignore deleted file mode 100644 index 5fbf210e0..000000000 --- a/tools/tr1/config/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -bin/ -obj/ -out/ -*.pubxml diff --git a/tools/tr1/config/TR1X_ConfigTool.sln b/tools/tr1/config/TR1X_ConfigTool.sln deleted file mode 100644 index e54647185..000000000 --- a/tools/tr1/config/TR1X_ConfigTool.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32407.343 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TR1X_ConfigTool", "TR1X_ConfigTool\TR1X_ConfigTool.csproj", "{DCFCB544-9B88-41D6-A995-EA2D06FE405E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|x64.ActiveCfg = Debug|x64 - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|x64.Build.0 = Debug|x64 - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|Any CPU.Build.0 = Release|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|x64.ActiveCfg = Release|x64 - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {49C0A7F4-2D17-424B-BD94-A8FC6E95931D} - EndGlobalSection -EndGlobal diff --git a/tools/tr2/config/.gitignore b/tools/tr2/config/.gitignore deleted file mode 100644 index 57193f228..000000000 --- a/tools/tr2/config/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -*.suo -*.o -*.obj -*.pdb -*.lib -*.exp -[Dd]ebug/ -[Rr]elease/ -[Oo]bj/ -*.user -*.ipch -.vs/ -*.vcxproj -*.filters -*.pubxml -out/ diff --git a/tools/tr2/config/TR2X_ConfigTool.sln b/tools/tr2/config/TR2X_ConfigTool.sln deleted file mode 100644 index 8c230ac9e..000000000 --- a/tools/tr2/config/TR2X_ConfigTool.sln +++ /dev/null @@ -1,30 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32407.343 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TR2X_ConfigTool", "TR2X_ConfigTool\TR2X_ConfigTool.csproj", "{DCFCB544-9B88-41D6-A995-EA2D06FE405E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|x64.ActiveCfg = Debug|x64 - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Debug|x64.Build.0 = Debug|x64 - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|Any CPU.Build.0 = Release|Any CPU - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|x64.ActiveCfg = Release|x64 - {DCFCB544-9B88-41D6-A995-EA2D06FE405E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {49C0A7F4-2D17-424B-BD94-A8FC6E95931D} - EndGlobalSection -EndGlobal