Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tools: merge config tool projects

Browse source 
This merges the three config tool projects into a single VS solution.
This commit is contained in:
lahm86 2025-04-03 09:54:27 +01:00
parent 6e27f24264
commit 494c2724fc
47 changed files with 24 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/config/.gitignore vendored
View file

@ -13,3 +13,4 @@
*.vcxproj
*.filters
*.pubxml
[Oo]ut/

0
tools/tr1/config/TR1X_ConfigTool/App.xaml → tools/config/TR1X_ConfigTool/App.xaml
View file

0
tools/tr1/config/TR1X_ConfigTool/App.xaml.cs → tools/config/TR1X_ConfigTool/App.xaml.cs
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic1.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic2.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic3.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic4.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic5.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic6.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg → tools/config/TR1X_ConfigTool/Resources/Graphics/graphic7.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/Lang/en-GB.json → tools/config/TR1X_ConfigTool/Resources/Lang/en-GB.json
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/Lang/en.json → tools/config/TR1X_ConfigTool/Resources/Lang/en.json
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/Lang/es.json → tools/config/TR1X_ConfigTool/Resources/Lang/es.json
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/Lang/fr.json → tools/config/TR1X_ConfigTool/Resources/Lang/fr.json
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/Lang/it.json → tools/config/TR1X_ConfigTool/Resources/Lang/it.json
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/TR1X.png → tools/config/TR1X_ConfigTool/Resources/TR1X.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/const.json → tools/config/TR1X_ConfigTool/Resources/const.json
View file

0
tools/tr1/config/TR1X_ConfigTool/Resources/icon.ico → tools/config/TR1X_ConfigTool/Resources/icon.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

Before After
Before After

0
tools/tr1/config/TR1X_ConfigTool/Resources/specification.json → tools/config/TR1X_ConfigTool/Resources/specification.json
View file

7
tools/tr1/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj → tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj
View file

@ -66,8 +66,9 @@
<EmbeddedResource Include="Resources\Lang\it.json" />
<EmbeddedResource Include="Resources\specification.json" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<Reference Include="TRX_ConfigToolLib">
<HintPath>..\..\..\config\TRX_ConfigToolLib\bin\Release\publish\TRX_ConfigToolLib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
</ItemGroup>
</Project>

0
tools/tr1/config/TR1X_ConfigTool/app.manifest → tools/config/TR1X_ConfigTool/app.manifest
View file

0
tools/tr2/config/TR2X_ConfigTool/App.xaml → tools/config/TR2X_ConfigTool/App.xaml
View file

0
tools/tr2/config/TR2X_ConfigTool/App.xaml.cs → tools/config/TR2X_ConfigTool/App.xaml.cs
View file

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic1.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic2.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic3.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic4.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic5.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic6.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg → tools/config/TR2X_ConfigTool/Resources/Graphics/graphic7.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/Lang/en.json → tools/config/TR2X_ConfigTool/Resources/Lang/en.json
View file

0
tools/tr2/config/TR2X_ConfigTool/Resources/Lang/it.json → tools/config/TR2X_ConfigTool/Resources/Lang/it.json
View file

0
tools/tr2/config/TR2X_ConfigTool/Resources/TR2X.png → tools/config/TR2X_ConfigTool/Resources/TR2X.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/const.json → tools/config/TR2X_ConfigTool/Resources/const.json
View file

0
tools/tr2/config/TR2X_ConfigTool/Resources/icon.ico → tools/config/TR2X_ConfigTool/Resources/icon.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 175 KiB

Before After
Before After

0
tools/tr2/config/TR2X_ConfigTool/Resources/specification.json → tools/config/TR2X_ConfigTool/Resources/specification.json
View file

7
tools/tr2/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj → tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj
View file

@ -60,8 +60,9 @@
<EmbeddedResource Include="Resources\Lang\it.json" />
<EmbeddedResource Include="Resources\specification.json" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<Reference Include="TRX_ConfigToolLib">
<HintPath>..\..\..\config\TRX_ConfigToolLib\bin\Release\publish\TRX_ConfigToolLib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
</ItemGroup>
</Project>

0
tools/tr2/config/TR2X_ConfigTool/app.manifest → tools/config/TR2X_ConfigTool/app.manifest
View file

12
tools/config/TRX_ConfigToolLib.sln → tools/config/TRX_ConfigTool.sln
View file

@ -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

1
tools/config/TRX_ConfigToolLib/TRX_ConfigToolLib.csproj
View file

@ -5,6 +5,7 @@
<UseWPF>true</UseWPF>
<ImplicitUsings>enable</ImplicitUsings>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\arrow-down.png" />

10
tools/shared/docker/config/entrypoint.sh
View file

@ -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

2
tools/shared/docker/game_entrypoint.py
View file

@ -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",
),

1
tools/shared/docker/installer/entrypoint.sh
View file

@ -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

4
tools/tr1/config/.gitignore vendored
View file

@ -1,4 +0,0 @@
bin/
obj/
out/
*.pubxml

31
tools/tr1/config/TR1X_ConfigTool.sln
View file

@ -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

16
tools/tr2/config/.gitignore vendored
View file

@ -1,16 +0,0 @@
*.suo
*.o
*.obj
*.pdb
*.lib
*.exp
[Dd]ebug/
[Rr]elease/
[Oo]bj/
*.user
*.ipch
.vs/
*.vcxproj
*.filters
*.pubxml
out/

30
tools/tr2/config/TR2X_ConfigTool.sln
View file

@ -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