tools: merge config tool projects

This merges the three config tool projects into a single VS solution.

tools/config/.gitignore

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

tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj

@@ -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">
+  </ItemGroup>
-      <HintPath>..\..\..\config\TRX_ConfigToolLib\bin\Release\publish\TRX_ConfigToolLib.dll</HintPath>
+
-    </Reference>
+  <ItemGroup>
+    <ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
   </ItemGroup>
 </Project>

tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj

@@ -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">
+  </ItemGroup>
-      <HintPath>..\..\..\config\TRX_ConfigToolLib\bin\Release\publish\TRX_ConfigToolLib.dll</HintPath>
+
-    </Reference>
+  <ItemGroup>
+    <ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
   </ItemGroup>
 </Project>

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

tools/config/TRX_ConfigToolLib/TRX_ConfigToolLib.csproj

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

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 TR${TR_VERSION}X_ConfigTool -c Release -o out
-dotnet publish -c Release -o out

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

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

tools/tr1/config/.gitignore

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

tools/tr1/config/TR1X_ConfigTool.sln

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

tools/tr2/config/.gitignore

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

tools/tr2/config/TR2X_ConfigTool.sln

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