From 6085ec6bc26d23bffa18ac929f5f546e7ebcabfe Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:10:40 +0100 Subject: [PATCH 1/9] remove external projects from sln --- Toolkit.sln | 78 ----------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/Toolkit.sln b/Toolkit.sln index f14137c..a7bf054 100644 --- a/Toolkit.sln +++ b/Toolkit.sln @@ -25,18 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtractKeysFromDump", "_Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.RDR2", "RageLib.RDR2\RageLib.RDR2.csproj", "{D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toolkit.Testing", "Toolkit.Testing", "{4E242742-D387-46F5-9D54-F7B8DA45BA52}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing.GTA5", "..\Toolkit.Testing\Testing.GTA5\Testing.GTA5.csproj", "{E35F87C9-1E39-44E4-BC72-336F5B63CB04}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "..\Toolkit.Testing\Benchmarks\Benchmarks.csproj", "{54965EB4-16F1-4044-B097-FA268BAB864E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing.RDR2", "..\Toolkit.Testing\Testing.RDR2\Testing.RDR2.csproj", "{49358D85-1177-406A-ABC2-0F5EF7C1D977}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiveTool", "Tools\ArchiveTool\ArchiveTool.csproj", "{E6F617A2-41B9-467B-A766-8623426AA780}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing.GTA4", "..\Toolkit.Testing\Testing.GTA4\Testing.GTA4.csproj", "{51A36403-FC82-42AE-A452-EF0816244494}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.GTA4", "RageLib.GTA4\RageLib.GTA4.csproj", "{BC45B630-A0A2-4B4B-823F-4BF98B9A878B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Core", "Tools\Tools.Core\Tools.Core.csproj", "{6750D120-68F0-4571-98BB-B1AD9109C9E1}" @@ -185,54 +175,6 @@ Global {D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}.Release|x64.Build.0 = Release|Any CPU {D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}.Release|x86.ActiveCfg = Release|Any CPU {D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}.Release|x86.Build.0 = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|arm64.ActiveCfg = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|arm64.Build.0 = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x64.ActiveCfg = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x64.Build.0 = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x86.ActiveCfg = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x86.Build.0 = Debug|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|Any CPU.Build.0 = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|arm64.ActiveCfg = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|arm64.Build.0 = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x64.ActiveCfg = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x64.Build.0 = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x86.ActiveCfg = Release|Any CPU - {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x86.Build.0 = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|arm64.ActiveCfg = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|arm64.Build.0 = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x64.ActiveCfg = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x64.Build.0 = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x86.ActiveCfg = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x86.Build.0 = Debug|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|Any CPU.Build.0 = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|arm64.ActiveCfg = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|arm64.Build.0 = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x64.ActiveCfg = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x64.Build.0 = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x86.ActiveCfg = Release|Any CPU - {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x86.Build.0 = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|arm64.ActiveCfg = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|arm64.Build.0 = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x64.ActiveCfg = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x64.Build.0 = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x86.ActiveCfg = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x86.Build.0 = Debug|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|Any CPU.Build.0 = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|arm64.ActiveCfg = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|arm64.Build.0 = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x64.ActiveCfg = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x64.Build.0 = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x86.ActiveCfg = Release|Any CPU - {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x86.Build.0 = Release|Any CPU {E6F617A2-41B9-467B-A766-8623426AA780}.Debug|Any CPU.ActiveCfg = Debug|x64 {E6F617A2-41B9-467B-A766-8623426AA780}.Debug|Any CPU.Build.0 = Debug|x64 {E6F617A2-41B9-467B-A766-8623426AA780}.Debug|arm64.ActiveCfg = Debug|arm64 @@ -250,22 +192,6 @@ Global {E6F617A2-41B9-467B-A766-8623426AA780}.Release|x64.Build.0 = Release|x64 {E6F617A2-41B9-467B-A766-8623426AA780}.Release|x86.ActiveCfg = Release|x86 {E6F617A2-41B9-467B-A766-8623426AA780}.Release|x86.Build.0 = Release|x86 - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|arm64.ActiveCfg = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|arm64.Build.0 = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x64.ActiveCfg = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x64.Build.0 = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x86.ActiveCfg = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x86.Build.0 = Debug|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|Any CPU.Build.0 = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|arm64.ActiveCfg = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|arm64.Build.0 = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|x64.ActiveCfg = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|x64.Build.0 = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|x86.ActiveCfg = Release|Any CPU - {51A36403-FC82-42AE-A452-EF0816244494}.Release|x86.Build.0 = Release|Any CPU {BC45B630-A0A2-4B4B-823F-4BF98B9A878B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BC45B630-A0A2-4B4B-823F-4BF98B9A878B}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC45B630-A0A2-4B4B-823F-4BF98B9A878B}.Debug|arm64.ActiveCfg = Debug|Any CPU @@ -323,11 +249,7 @@ Global {755AB64B-16B4-4C90-AA3B-BFF448E5A21E} = {12632945-ACEA-493E-AE35-36FBC4AD2FF1} {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65} = {36EED776-1944-4C7B-A662-FBB1E36B6773} {D6DC4413-15ED-4511-B0DB-D287EA1FDC99} = {E240F677-DCC5-4C33-B370-119A9E4A5144} - {E35F87C9-1E39-44E4-BC72-336F5B63CB04} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} - {54965EB4-16F1-4044-B097-FA268BAB864E} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} - {49358D85-1177-406A-ABC2-0F5EF7C1D977} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} {E6F617A2-41B9-467B-A766-8623426AA780} = {36EED776-1944-4C7B-A662-FBB1E36B6773} - {51A36403-FC82-42AE-A452-EF0816244494} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} {6750D120-68F0-4571-98BB-B1AD9109C9E1} = {36EED776-1944-4C7B-A662-FBB1E36B6773} {9D956A23-5AF9-46AC-ABD2-174D36B7321F} = {E240F677-DCC5-4C33-B370-119A9E4A5144} EndGlobalSection From d8af056aea42d99bc2ff10ff12638aaf67fb7bb7 Mon Sep 17 00:00:00 2001 From: Neos7 <24431753+carmineos@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:08:33 +0100 Subject: [PATCH 2/9] Create build.yml --- .github/workflows/build.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0bfc8aa --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,28 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: .NET + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 8.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal From 5ee0febb59af1f6bdbb04f111bf822a075999cf7 Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:15:21 +0100 Subject: [PATCH 3/9] tools: EnableWindowsTargeting --- Tools/ArchiveTool/ArchiveTool.csproj | 1 + Tools/TextureTool/TextureTool.csproj | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Tools/ArchiveTool/ArchiveTool.csproj b/Tools/ArchiveTool/ArchiveTool.csproj index ab24ab8..250e347 100755 --- a/Tools/ArchiveTool/ArchiveTool.csproj +++ b/Tools/ArchiveTool/ArchiveTool.csproj @@ -14,6 +14,7 @@ true None true + true diff --git a/Tools/TextureTool/TextureTool.csproj b/Tools/TextureTool/TextureTool.csproj index 370e5d3..f66c420 100755 --- a/Tools/TextureTool/TextureTool.csproj +++ b/Tools/TextureTool/TextureTool.csproj @@ -5,8 +5,9 @@ net8.0-windows TextureTool TextureTool - true - true + true + true + true From 85ce350358793e3f9ec38d9b1e331984e58ed144 Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:15:44 +0100 Subject: [PATCH 4/9] tests: fix MetaXmlExporterIntegrationTests --- .../PC/Meta/MetaXmlExporterIntegrationTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RageLib.GTA5.UnitTests/ResourceWrappers/PC/Meta/MetaXmlExporterIntegrationTests.cs b/RageLib.GTA5.UnitTests/ResourceWrappers/PC/Meta/MetaXmlExporterIntegrationTests.cs index f860135..1f12a05 100644 --- a/RageLib.GTA5.UnitTests/ResourceWrappers/PC/Meta/MetaXmlExporterIntegrationTests.cs +++ b/RageLib.GTA5.UnitTests/ResourceWrappers/PC/Meta/MetaXmlExporterIntegrationTests.cs @@ -2,6 +2,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using RageLib.GTA5.ResourceWrappers.PC.Meta; +using RageLib.Services; using System; using System.Globalization; using System.IO; @@ -21,7 +22,7 @@ public void Export_Always_CorrectlyExportsXml() { Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - var exporter = new MetaXmlExporter(); + var exporter = new MetaXmlExporter(JenkinsDictionary.Shared); var xmlStream = new MemoryStream(); var rootStructure = TestDataset.MakeDataset(); From fc3903c328e9eb83b280070abe83de7fc9f2f0e7 Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:17:50 +0100 Subject: [PATCH 5/9] remove DirectXTex from sln --- Toolkit.sln | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Toolkit.sln b/Toolkit.sln index a7bf054..04e8612 100644 --- a/Toolkit.sln +++ b/Toolkit.sln @@ -11,10 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib", "RageLib\RageLib. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.GTA5", "RageLib.GTA5\RageLib.GTA5.csproj", "{569CDE34-96F0-44BE-BD31-62B6A43C85B8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{12632945-ACEA-493E-AE35-36FBC4AD2FF1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "Libraries\DirectXTex\DirectXTex.vcxproj", "{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetaTool", "Tools\MetaTool\MetaTool.csproj", "{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.GTA5.UnitTests", "RageLib.GTA5.UnitTests\RageLib.GTA5.UnitTests.csproj", "{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}" @@ -98,19 +94,6 @@ Global {569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x64.Build.0 = Release|Any CPU {569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x86.ActiveCfg = Release|Any CPU {569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x86.Build.0 = Release|Any CPU - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|Any CPU.ActiveCfg = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|Any CPU.Build.0 = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|arm64.ActiveCfg = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|arm64.Build.0 = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x64.ActiveCfg = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x64.Build.0 = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x86.ActiveCfg = Debug|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|Any CPU.ActiveCfg = Release|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|arm64.ActiveCfg = Release|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|arm64.Build.0 = Release|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x64.ActiveCfg = Release|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x64.Build.0 = Release|x64 - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x86.ActiveCfg = Release|x64 {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|arm64.ActiveCfg = Debug|Any CPU @@ -246,7 +229,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0C1A9502-FEF1-423D-8798-FCC5C84EAEFE} = {36EED776-1944-4C7B-A662-FBB1E36B6773} - {755AB64B-16B4-4C90-AA3B-BFF448E5A21E} = {12632945-ACEA-493E-AE35-36FBC4AD2FF1} {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65} = {36EED776-1944-4C7B-A662-FBB1E36B6773} {D6DC4413-15ED-4511-B0DB-D287EA1FDC99} = {E240F677-DCC5-4C33-B370-119A9E4A5144} {E6F617A2-41B9-467B-A766-8623426AA780} = {36EED776-1944-4C7B-A662-FBB1E36B6773} From bd6d80888dbe751f95cb217ae75144b6608d6dc9 Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:19:11 +0100 Subject: [PATCH 6/9] Revert "remove DirectXTex from sln" This reverts commit fc3903c328e9eb83b280070abe83de7fc9f2f0e7. --- Toolkit.sln | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Toolkit.sln b/Toolkit.sln index 04e8612..a7bf054 100644 --- a/Toolkit.sln +++ b/Toolkit.sln @@ -11,6 +11,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib", "RageLib\RageLib. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.GTA5", "RageLib.GTA5\RageLib.GTA5.csproj", "{569CDE34-96F0-44BE-BD31-62B6A43C85B8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{12632945-ACEA-493E-AE35-36FBC4AD2FF1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "Libraries\DirectXTex\DirectXTex.vcxproj", "{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetaTool", "Tools\MetaTool\MetaTool.csproj", "{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.GTA5.UnitTests", "RageLib.GTA5.UnitTests\RageLib.GTA5.UnitTests.csproj", "{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}" @@ -94,6 +98,19 @@ Global {569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x64.Build.0 = Release|Any CPU {569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x86.ActiveCfg = Release|Any CPU {569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x86.Build.0 = Release|Any CPU + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|Any CPU.ActiveCfg = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|Any CPU.Build.0 = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|arm64.ActiveCfg = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|arm64.Build.0 = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x64.ActiveCfg = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x64.Build.0 = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x86.ActiveCfg = Debug|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|Any CPU.ActiveCfg = Release|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|arm64.ActiveCfg = Release|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|arm64.Build.0 = Release|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x64.ActiveCfg = Release|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x64.Build.0 = Release|x64 + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x86.ActiveCfg = Release|x64 {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|arm64.ActiveCfg = Debug|Any CPU @@ -229,6 +246,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0C1A9502-FEF1-423D-8798-FCC5C84EAEFE} = {36EED776-1944-4C7B-A662-FBB1E36B6773} + {755AB64B-16B4-4C90-AA3B-BFF448E5A21E} = {12632945-ACEA-493E-AE35-36FBC4AD2FF1} {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65} = {36EED776-1944-4C7B-A662-FBB1E36B6773} {D6DC4413-15ED-4511-B0DB-D287EA1FDC99} = {E240F677-DCC5-4C33-B370-119A9E4A5144} {E6F617A2-41B9-467B-A766-8623426AA780} = {36EED776-1944-4C7B-A662-FBB1E36B6773} From fa1b90283783b508661af66ae856e1fa61960ca9 Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:29:26 +0100 Subject: [PATCH 7/9] ghactions: build only solution filter --- .github/workflows/build.yml | 8 +++++--- Toolkit.Libraries.slnf | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 Toolkit.Libraries.slnf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bfc8aa..092869d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,8 @@ jobs: runs-on: ubuntu-latest + env: + SolutionName: Toolkit.Libraries.slnf steps: - uses: actions/checkout@v3 - name: Setup .NET @@ -21,8 +23,8 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore $SolutionName - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore $SolutionName - name: Test - run: dotnet test --no-build --verbosity normal + run: dotnet test --no-build --verbosity normal $SolutionName diff --git a/Toolkit.Libraries.slnf b/Toolkit.Libraries.slnf new file mode 100644 index 0000000..caaf436 --- /dev/null +++ b/Toolkit.Libraries.slnf @@ -0,0 +1,11 @@ +{ + "solution": { + "path": "Toolkit.sln", + "projects": [ + "RageLib.GTA4\\RageLib.GTA4.csproj", + "RageLib.GTA5\\RageLib.GTA5.csproj", + "RageLib.RDR2\\RageLib.RDR2.csproj", + "RageLib\\RageLib.csproj" + ] + } +} \ No newline at end of file From 77dc310665eca05f2bf5bf20094bd0f5a11bada9 Mon Sep 17 00:00:00 2001 From: Neos7 <24431753+carmineos@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:33:54 +0100 Subject: [PATCH 8/9] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 092869d..432eb65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest env: - SolutionName: Toolkit.Libraries.slnf + SOLUTION_NAME: Toolkit.Libraries.slnf steps: - uses: actions/checkout@v3 - name: Setup .NET @@ -23,8 +23,8 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore $SolutionName + run: dotnet restore $SOLUTION_NAME - name: Build - run: dotnet build --no-restore $SolutionName + run: dotnet build --no-restore $SOLUTION_NAME - name: Test - run: dotnet test --no-build --verbosity normal $SolutionName + run: dotnet test --no-build --verbosity normal $SOLUTION_NAME From ca8a6f9195ca0e373039703d566ec9f13031ce87 Mon Sep 17 00:00:00 2001 From: carmineos Date: Tue, 28 Nov 2023 12:37:29 +0100 Subject: [PATCH 9/9] Revert "remove external projects from sln" This reverts commit 6085ec6bc26d23bffa18ac929f5f546e7ebcabfe. --- Toolkit.sln | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/Toolkit.sln b/Toolkit.sln index a7bf054..f14137c 100644 --- a/Toolkit.sln +++ b/Toolkit.sln @@ -25,8 +25,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtractKeysFromDump", "_Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.RDR2", "RageLib.RDR2\RageLib.RDR2.csproj", "{D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toolkit.Testing", "Toolkit.Testing", "{4E242742-D387-46F5-9D54-F7B8DA45BA52}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing.GTA5", "..\Toolkit.Testing\Testing.GTA5\Testing.GTA5.csproj", "{E35F87C9-1E39-44E4-BC72-336F5B63CB04}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "..\Toolkit.Testing\Benchmarks\Benchmarks.csproj", "{54965EB4-16F1-4044-B097-FA268BAB864E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing.RDR2", "..\Toolkit.Testing\Testing.RDR2\Testing.RDR2.csproj", "{49358D85-1177-406A-ABC2-0F5EF7C1D977}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiveTool", "Tools\ArchiveTool\ArchiveTool.csproj", "{E6F617A2-41B9-467B-A766-8623426AA780}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing.GTA4", "..\Toolkit.Testing\Testing.GTA4\Testing.GTA4.csproj", "{51A36403-FC82-42AE-A452-EF0816244494}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageLib.GTA4", "RageLib.GTA4\RageLib.GTA4.csproj", "{BC45B630-A0A2-4B4B-823F-4BF98B9A878B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Core", "Tools\Tools.Core\Tools.Core.csproj", "{6750D120-68F0-4571-98BB-B1AD9109C9E1}" @@ -175,6 +185,54 @@ Global {D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}.Release|x64.Build.0 = Release|Any CPU {D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}.Release|x86.ActiveCfg = Release|Any CPU {D97974B1-4DD3-4DF0-AD4F-7CA760CBE1C7}.Release|x86.Build.0 = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|arm64.ActiveCfg = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|arm64.Build.0 = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x64.ActiveCfg = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x64.Build.0 = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x86.ActiveCfg = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Debug|x86.Build.0 = Debug|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|Any CPU.Build.0 = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|arm64.ActiveCfg = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|arm64.Build.0 = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x64.ActiveCfg = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x64.Build.0 = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x86.ActiveCfg = Release|Any CPU + {E35F87C9-1E39-44E4-BC72-336F5B63CB04}.Release|x86.Build.0 = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|arm64.ActiveCfg = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|arm64.Build.0 = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x64.ActiveCfg = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x64.Build.0 = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x86.ActiveCfg = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Debug|x86.Build.0 = Debug|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|Any CPU.Build.0 = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|arm64.ActiveCfg = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|arm64.Build.0 = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x64.ActiveCfg = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x64.Build.0 = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x86.ActiveCfg = Release|Any CPU + {54965EB4-16F1-4044-B097-FA268BAB864E}.Release|x86.Build.0 = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|arm64.ActiveCfg = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|arm64.Build.0 = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x64.ActiveCfg = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x64.Build.0 = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x86.ActiveCfg = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Debug|x86.Build.0 = Debug|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|Any CPU.Build.0 = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|arm64.ActiveCfg = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|arm64.Build.0 = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x64.ActiveCfg = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x64.Build.0 = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x86.ActiveCfg = Release|Any CPU + {49358D85-1177-406A-ABC2-0F5EF7C1D977}.Release|x86.Build.0 = Release|Any CPU {E6F617A2-41B9-467B-A766-8623426AA780}.Debug|Any CPU.ActiveCfg = Debug|x64 {E6F617A2-41B9-467B-A766-8623426AA780}.Debug|Any CPU.Build.0 = Debug|x64 {E6F617A2-41B9-467B-A766-8623426AA780}.Debug|arm64.ActiveCfg = Debug|arm64 @@ -192,6 +250,22 @@ Global {E6F617A2-41B9-467B-A766-8623426AA780}.Release|x64.Build.0 = Release|x64 {E6F617A2-41B9-467B-A766-8623426AA780}.Release|x86.ActiveCfg = Release|x86 {E6F617A2-41B9-467B-A766-8623426AA780}.Release|x86.Build.0 = Release|x86 + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|arm64.ActiveCfg = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|arm64.Build.0 = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x64.ActiveCfg = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x64.Build.0 = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x86.ActiveCfg = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Debug|x86.Build.0 = Debug|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|Any CPU.Build.0 = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|arm64.ActiveCfg = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|arm64.Build.0 = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|x64.ActiveCfg = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|x64.Build.0 = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|x86.ActiveCfg = Release|Any CPU + {51A36403-FC82-42AE-A452-EF0816244494}.Release|x86.Build.0 = Release|Any CPU {BC45B630-A0A2-4B4B-823F-4BF98B9A878B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BC45B630-A0A2-4B4B-823F-4BF98B9A878B}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC45B630-A0A2-4B4B-823F-4BF98B9A878B}.Debug|arm64.ActiveCfg = Debug|Any CPU @@ -249,7 +323,11 @@ Global {755AB64B-16B4-4C90-AA3B-BFF448E5A21E} = {12632945-ACEA-493E-AE35-36FBC4AD2FF1} {EE0B585C-081B-4E36-AF53-7F4E4D5E7A65} = {36EED776-1944-4C7B-A662-FBB1E36B6773} {D6DC4413-15ED-4511-B0DB-D287EA1FDC99} = {E240F677-DCC5-4C33-B370-119A9E4A5144} + {E35F87C9-1E39-44E4-BC72-336F5B63CB04} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} + {54965EB4-16F1-4044-B097-FA268BAB864E} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} + {49358D85-1177-406A-ABC2-0F5EF7C1D977} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} {E6F617A2-41B9-467B-A766-8623426AA780} = {36EED776-1944-4C7B-A662-FBB1E36B6773} + {51A36403-FC82-42AE-A452-EF0816244494} = {4E242742-D387-46F5-9D54-F7B8DA45BA52} {6750D120-68F0-4571-98BB-B1AD9109C9E1} = {36EED776-1944-4C7B-A662-FBB1E36B6773} {9D956A23-5AF9-46AC-ABD2-174D36B7321F} = {E240F677-DCC5-4C33-B370-119A9E4A5144} EndGlobalSection