From 37f7ed76b8a8122ebb347210daefb731ec340045 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Apr 2026 15:48:32 +0000 Subject: [PATCH 1/4] Initial plan From d8237ec3da22cd1f9b8fe7e3c8a925be34f4b909 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Apr 2026 15:53:37 +0000 Subject: [PATCH 2/4] Migrate to slnx and clean up solutions Agent-Logs-Url: https://github.com/ikkentim/SampSharp/sessions/c52a8c19-8e99-4d86-be74-5e837ddc3a5c Co-authored-by: ikkentim <2820647+ikkentim@users.noreply.github.com> --- .github/workflows/dotnet-component.yml | 4 +- SampSharp.sln | 106 ------------- SampSharp.slnx | 25 ++++ ....DotSettings => SampSharp.slnx.DotSettings | 0 build.cmd | 8 +- build.sh | 16 +- src/legacy/SampSharp.Plugin.sln | 31 ---- src/legacy/SampSharp.sln | 112 -------------- src/legacy/SampSharp.slnx | 11 ++ ...DotSettings => SampSharp.slnx.DotSettings} | 0 src/legacy/SampSharp/SampSharp.vcxproj | 139 ------------------ .../SampSharp/SampSharp.vcxproj.filters | 115 --------------- 12 files changed, 50 insertions(+), 517 deletions(-) delete mode 100644 SampSharp.sln create mode 100644 SampSharp.slnx rename SampSharp.sln.DotSettings => SampSharp.slnx.DotSettings (100%) delete mode 100644 src/legacy/SampSharp.Plugin.sln delete mode 100644 src/legacy/SampSharp.sln create mode 100644 src/legacy/SampSharp.slnx rename src/legacy/{SampSharp.sln.DotSettings => SampSharp.slnx.DotSettings} (100%) delete mode 100644 src/legacy/SampSharp/SampSharp.vcxproj delete mode 100644 src/legacy/SampSharp/SampSharp.vcxproj.filters diff --git a/.github/workflows/dotnet-component.yml b/.github/workflows/dotnet-component.yml index ad7a95f9..aa19799c 100644 --- a/.github/workflows/dotnet-component.yml +++ b/.github/workflows/dotnet-component.yml @@ -9,7 +9,7 @@ on: - .github/workflows/dotnet-component.yml - src/SampSharp.*/** - src/TestMode.*/** - - SampSharp.sln + - SampSharp.slnx - Directory.Build.props - build.sh @@ -21,7 +21,7 @@ on: - .github/workflows/dotnet-component.yml - src/SampSharp.*/** - src/TestMode.*/** - - SampSharp.sln + - SampSharp.slnx - Directory.Build.props - build.sh diff --git a/SampSharp.sln b/SampSharp.sln deleted file mode 100644 index 4bd1f4f3..00000000 --- a/SampSharp.sln +++ /dev/null @@ -1,106 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34316.72 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampSharp.OpenMp.Core", "src\SampSharp.OpenMp.Core\SampSharp.OpenMp.Core.csproj", "{25744E3B-22E4-4296-A3E7-285FEBE6D8EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampSharp.SourceGenerator", "src\SampSharp.SourceGenerator\SampSharp.SourceGenerator.csproj", "{B46B7075-DE9F-4627-996D-B58A7F518BC7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A8859FD-936F-4B65-ADCF-D9699094B734}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .gitignore = .gitignore - Directory.Build.props = Directory.Build.props - LICENSE = LICENSE - README.md = README.md - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestMode.OpenMp.Core", "src\TestMode.OpenMp.Core\TestMode.OpenMp.Core.csproj", "{4262C3BF-74C9-4BC2-9775-D05866DCCA6D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampSharp.Analyzer", "src\SampSharp.Analyzer\SampSharp.Analyzer.csproj", "{C07D4977-7729-44C1-A4DA-7E2D0249F836}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeAnalysis", "CodeAnalysis", "{1779A01D-61FA-4683-A154-88970557D5F7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampSharp.CodeFixes", "src\SampSharp.CodeFixes\SampSharp.CodeFixes.csproj", "{C1EB9CED-D661-462D-BB8F-F32864B5149F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampSharp", "SampSharp", "{D523C91A-D20C-4674-9958-FF43E131BBE6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestingModes", "TestingModes", "{B729F640-F930-4631-97EF-B649E23ACE5A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampSharp.Sdk", "src\SampSharp.Sdk\SampSharp.Sdk.csproj", "{BAECE101-E831-41BC-BBCB-6464B4AB305A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampSharp.OpenMp.Entities", "src\SampSharp.OpenMp.Entities\SampSharp.OpenMp.Entities.csproj", "{F9D7210F-F87D-4FC1-90DF-A2496B7D0253}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampSharp.OpenMp.Entities.Commands", "src\SampSharp.OpenMp.Entities.Commands\SampSharp.OpenMp.Entities.Commands.csproj", "{A291514D-ACC7-4C69-ABB3-8D71D3691BB4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestMode.OpenMp.Entities", "src\TestMode.OpenMp.Entities\TestMode.OpenMp.Entities.csproj", "{EA866E1C-37C0-42C7-B0F7-F8B9BF4B3327}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestMode.UnitTests", "src\TestMode.UnitTests\TestMode.UnitTests.csproj", "{0209A3FA-DA60-4FD7-BD06-38E4FC316F07}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {25744E3B-22E4-4296-A3E7-285FEBE6D8EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25744E3B-22E4-4296-A3E7-285FEBE6D8EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25744E3B-22E4-4296-A3E7-285FEBE6D8EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25744E3B-22E4-4296-A3E7-285FEBE6D8EB}.Release|Any CPU.Build.0 = Release|Any CPU - {B46B7075-DE9F-4627-996D-B58A7F518BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B46B7075-DE9F-4627-996D-B58A7F518BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B46B7075-DE9F-4627-996D-B58A7F518BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B46B7075-DE9F-4627-996D-B58A7F518BC7}.Release|Any CPU.Build.0 = Release|Any CPU - {4262C3BF-74C9-4BC2-9775-D05866DCCA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4262C3BF-74C9-4BC2-9775-D05866DCCA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4262C3BF-74C9-4BC2-9775-D05866DCCA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4262C3BF-74C9-4BC2-9775-D05866DCCA6D}.Release|Any CPU.Build.0 = Release|Any CPU - {C07D4977-7729-44C1-A4DA-7E2D0249F836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C07D4977-7729-44C1-A4DA-7E2D0249F836}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C07D4977-7729-44C1-A4DA-7E2D0249F836}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C07D4977-7729-44C1-A4DA-7E2D0249F836}.Release|Any CPU.Build.0 = Release|Any CPU - {C1EB9CED-D661-462D-BB8F-F32864B5149F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1EB9CED-D661-462D-BB8F-F32864B5149F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1EB9CED-D661-462D-BB8F-F32864B5149F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1EB9CED-D661-462D-BB8F-F32864B5149F}.Release|Any CPU.Build.0 = Release|Any CPU - {BAECE101-E831-41BC-BBCB-6464B4AB305A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAECE101-E831-41BC-BBCB-6464B4AB305A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAECE101-E831-41BC-BBCB-6464B4AB305A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAECE101-E831-41BC-BBCB-6464B4AB305A}.Release|Any CPU.Build.0 = Release|Any CPU - {F9D7210F-F87D-4FC1-90DF-A2496B7D0253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9D7210F-F87D-4FC1-90DF-A2496B7D0253}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9D7210F-F87D-4FC1-90DF-A2496B7D0253}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9D7210F-F87D-4FC1-90DF-A2496B7D0253}.Release|Any CPU.Build.0 = Release|Any CPU - {A291514D-ACC7-4C69-ABB3-8D71D3691BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A291514D-ACC7-4C69-ABB3-8D71D3691BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A291514D-ACC7-4C69-ABB3-8D71D3691BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A291514D-ACC7-4C69-ABB3-8D71D3691BB4}.Release|Any CPU.Build.0 = Release|Any CPU - {EA866E1C-37C0-42C7-B0F7-F8B9BF4B3327}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA866E1C-37C0-42C7-B0F7-F8B9BF4B3327}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA866E1C-37C0-42C7-B0F7-F8B9BF4B3327}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA866E1C-37C0-42C7-B0F7-F8B9BF4B3327}.Release|Any CPU.Build.0 = Release|Any CPU - {0209A3FA-DA60-4FD7-BD06-38E4FC316F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0209A3FA-DA60-4FD7-BD06-38E4FC316F07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0209A3FA-DA60-4FD7-BD06-38E4FC316F07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0209A3FA-DA60-4FD7-BD06-38E4FC316F07}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {25744E3B-22E4-4296-A3E7-285FEBE6D8EB} = {D523C91A-D20C-4674-9958-FF43E131BBE6} - {B46B7075-DE9F-4627-996D-B58A7F518BC7} = {1779A01D-61FA-4683-A154-88970557D5F7} - {4262C3BF-74C9-4BC2-9775-D05866DCCA6D} = {B729F640-F930-4631-97EF-B649E23ACE5A} - {C07D4977-7729-44C1-A4DA-7E2D0249F836} = {1779A01D-61FA-4683-A154-88970557D5F7} - {C1EB9CED-D661-462D-BB8F-F32864B5149F} = {1779A01D-61FA-4683-A154-88970557D5F7} - {BAECE101-E831-41BC-BBCB-6464B4AB305A} = {D523C91A-D20C-4674-9958-FF43E131BBE6} - {F9D7210F-F87D-4FC1-90DF-A2496B7D0253} = {D523C91A-D20C-4674-9958-FF43E131BBE6} - {A291514D-ACC7-4C69-ABB3-8D71D3691BB4} = {D523C91A-D20C-4674-9958-FF43E131BBE6} - {EA866E1C-37C0-42C7-B0F7-F8B9BF4B3327} = {B729F640-F930-4631-97EF-B649E23ACE5A} - {0209A3FA-DA60-4FD7-BD06-38E4FC316F07} = {B729F640-F930-4631-97EF-B649E23ACE5A} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A40756BA-E781-4BEA-924E-BBE3AC843108} - EndGlobalSection -EndGlobal diff --git a/SampSharp.slnx b/SampSharp.slnx new file mode 100644 index 00000000..78c11c30 --- /dev/null +++ b/SampSharp.slnx @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SampSharp.sln.DotSettings b/SampSharp.slnx.DotSettings similarity index 100% rename from SampSharp.sln.DotSettings rename to SampSharp.slnx.DotSettings diff --git a/build.cmd b/build.cmd index 7d8779f2..b09a72cf 100644 --- a/build.cmd +++ b/build.cmd @@ -99,7 +99,7 @@ exit /b 1 cd /d "%SCRIPTDIR%src\legacy" echo. echo Building C# libraries... -dotnet build SampSharp.sln -c Release +dotnet build SampSharp.slnx -c Release if errorlevel 1 exit /b 1 exit /b 0 @@ -107,7 +107,7 @@ exit /b 0 cd /d "%SCRIPTDIR%src\legacy" echo. echo Packing C# libraries... -dotnet pack SampSharp.sln -c Release +dotnet pack SampSharp.slnx -c Release if errorlevel 1 exit /b 1 echo. echo NuGet packages created in: %SCRIPTDIR%build\artifacts\packages @@ -117,7 +117,7 @@ exit /b 0 cd /d "%SCRIPTDIR%" echo. echo Building C# libraries... -dotnet build SampSharp.sln -c Release +dotnet build SampSharp.slnx -c Release if errorlevel 1 exit /b 1 exit /b 0 @@ -125,7 +125,7 @@ exit /b 0 cd /d "%SCRIPTDIR%" echo. echo Packing C# libraries... -dotnet pack SampSharp.sln -c Release +dotnet pack SampSharp.slnx -c Release if errorlevel 1 exit /b 1 echo. echo NuGet packages created in: %SCRIPTDIR%build\artifacts\packages diff --git a/build.sh b/build.sh index 3efd1a96..594c2639 100755 --- a/build.sh +++ b/build.sh @@ -27,9 +27,9 @@ build_component_libraries() { echo "" echo "Building C# libraries..." if [ -n "$CiVersion" ]; then - dotnet build SampSharp.sln -c Release "/p:CiVersion=$CiVersion" + dotnet build SampSharp.slnx -c Release "/p:CiVersion=$CiVersion" else - dotnet build SampSharp.sln -c Release + dotnet build SampSharp.slnx -c Release fi } @@ -40,9 +40,9 @@ pack_component_libraries() { echo "" echo "Packing C# libraries..." if [ -n "$CiVersion" ]; then - dotnet pack SampSharp.sln -c Release "/p:CiVersion=$CiVersion" + dotnet pack SampSharp.slnx -c Release "/p:CiVersion=$CiVersion" else - dotnet pack SampSharp.sln -c Release + dotnet pack SampSharp.slnx -c Release fi echo "" @@ -56,9 +56,9 @@ build_legacy_libraries() { echo "" echo "Building C# libraries..." if [ -n "$CiVersion" ]; then - dotnet build SampSharp.sln -c Release "/p:CiVersion=$CiVersion" + dotnet build SampSharp.slnx -c Release "/p:CiVersion=$CiVersion" else - dotnet build SampSharp.sln -c Release + dotnet build SampSharp.slnx -c Release fi } @@ -69,9 +69,9 @@ pack_legacy_libraries() { echo "" echo "Packing C# libraries..." if [ -n "$CiVersion" ]; then - dotnet pack SampSharp.sln -c Release "/p:CiVersion=$CiVersion" + dotnet pack SampSharp.slnx -c Release "/p:CiVersion=$CiVersion" else - dotnet pack SampSharp.sln -c Release + dotnet pack SampSharp.slnx -c Release fi echo "" diff --git a/src/legacy/SampSharp.Plugin.sln b/src/legacy/SampSharp.Plugin.sln deleted file mode 100644 index d61c7014..00000000 --- a/src/legacy/SampSharp.Plugin.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32112.339 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampSharp", "SampSharp\SampSharp.vcxproj", "{39908193-8E5A-42EC-B71B-5D457CE87823}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {39908193-8E5A-42EC-B71B-5D457CE87823}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Debug|Any CPU.Build.0 = Debug|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Debug|x86.ActiveCfg = Debug|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Debug|x86.Build.0 = Debug|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Release|Any CPU.ActiveCfg = Release|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Release|Any CPU.Build.0 = Release|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Release|x86.ActiveCfg = Release|Win32 - {39908193-8E5A-42EC-B71B-5D457CE87823}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DFD49E73-8AE6-4FD6-B652-BDBBAC28CAB9} - EndGlobalSection -EndGlobal diff --git a/src/legacy/SampSharp.sln b/src/legacy/SampSharp.sln deleted file mode 100644 index da81a6e8..00000000 --- a/src/legacy/SampSharp.sln +++ /dev/null @@ -1,112 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32112.339 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampSharp.Core", "SampSharp.Core\SampSharp.Core.csproj", "{7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampSharp.GameMode", "SampSharp.GameMode\SampSharp.GameMode.csproj", "{153D7525-B36F-4DB9-B5B6-483915C84A7E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestMode.GameMode", "TestMode.GameMode\TestMode.GameMode.csproj", "{AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6B10DCD1-5FFB-4B21-AF82-1906E6AF7119}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampSharp.Entities", "SampSharp.Entities\SampSharp.Entities.csproj", "{DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestMode.Entities", "TestMode.Entities\TestMode.Entities.csproj", "{9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampSharp.Core.UnitTests", "SampSharp.Core.UnitTests\SampSharp.Core.UnitTests.csproj", "{791B7ABD-43B4-436A-8E55-DA573B102E86}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Debug|Win32.ActiveCfg = Debug|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Debug|Win32.Build.0 = Debug|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Release|Win32.ActiveCfg = Release|Any CPU - {7B9345A8-80F3-43E3-B3E1-B3E3B45B8B0F}.Release|Win32.Build.0 = Release|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Debug|Win32.ActiveCfg = Debug|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Debug|Win32.Build.0 = Debug|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Release|Any CPU.Build.0 = Release|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Release|Win32.ActiveCfg = Release|Any CPU - {153D7525-B36F-4DB9-B5B6-483915C84A7E}.Release|Win32.Build.0 = Release|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Debug|Win32.ActiveCfg = Debug|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Debug|Win32.Build.0 = Debug|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Release|Any CPU.Build.0 = Release|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Release|Win32.ActiveCfg = Release|Any CPU - {AAF5CF0F-5B39-4122-B2A2-E7D5910CB4D5}.Release|Win32.Build.0 = Release|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Debug|Win32.ActiveCfg = Debug|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Debug|Win32.Build.0 = Debug|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Release|Any CPU.Build.0 = Release|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Release|Win32.ActiveCfg = Release|Any CPU - {DBADB3D5-8B69-416C-9A97-0A9767DFBC7A}.Release|Win32.Build.0 = Release|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Debug|Win32.ActiveCfg = Debug|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Debug|Win32.Build.0 = Debug|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Release|Any CPU.Build.0 = Release|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Release|Win32.ActiveCfg = Release|Any CPU - {9ADD7452-9B5A-42FF-BAA0-AFBC93BE711A}.Release|Win32.Build.0 = Release|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Debug|Win32.ActiveCfg = Debug|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Debug|Win32.Build.0 = Debug|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Release|Any CPU.Build.0 = Release|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Release|Win32.ActiveCfg = Release|Any CPU - {791B7ABD-43B4-436A-8E55-DA573B102E86}.Release|Win32.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E69A8CDF-CDC5-4DBC-B460-50E725F37809} - EndGlobalSection -EndGlobal diff --git a/src/legacy/SampSharp.slnx b/src/legacy/SampSharp.slnx new file mode 100644 index 00000000..b2432ef7 --- /dev/null +++ b/src/legacy/SampSharp.slnx @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/legacy/SampSharp.sln.DotSettings b/src/legacy/SampSharp.slnx.DotSettings similarity index 100% rename from src/legacy/SampSharp.sln.DotSettings rename to src/legacy/SampSharp.slnx.DotSettings diff --git a/src/legacy/SampSharp/SampSharp.vcxproj b/src/legacy/SampSharp/SampSharp.vcxproj deleted file mode 100644 index 19689b5e..00000000 --- a/src/legacy/SampSharp/SampSharp.vcxproj +++ /dev/null @@ -1,139 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {39908193-8E5A-42EC-B71B-5D457CE87823} - Win32Proj - SampSharp - SampSharp - 10.0 - - - - DynamicLibrary - true - MultiByte - false - v145 - - - DynamicLibrary - false - v145 - true - MultiByte - - - - - - - - - - - - - true - $(SolutionDir)..\..\env\plugins\ - - - false - $(SolutionDir)..\..\build\bin\SampSharp\Release\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;SAMPGDK_AMALGAMATION;SAMPGDK_CPP_WRAPPERS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - includes;includes/sdk;includes/sdk/amx;%(AdditionalIncludeDirectories) - - - true - stdcpp17 - - - true - Shlwapi.lib;%(AdditionalDependencies) - SampSharp.def - - - - - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_WINDOWS;_USRDLL;SAMPGDK_AMALGAMATION;SAMPGDK_CPP_WRAPPERS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - includes;includes/sdk;includes/sdk/amx - stdcpp17 - - - true - true - true - SampSharp.def - Shlwapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/legacy/SampSharp/SampSharp.vcxproj.filters b/src/legacy/SampSharp/SampSharp.vcxproj.filters deleted file mode 100644 index 30c2ab5c..00000000 --- a/src/legacy/SampSharp/SampSharp.vcxproj.filters +++ /dev/null @@ -1,115 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {42e6ff68-9725-46d0-a1e1-a9291f773ed9} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\deps - - - Source Files\deps - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - \ No newline at end of file From 406ce3a9aaf0f42fb76916fc923ce6d5cfb7dc3e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Apr 2026 16:50:15 +0000 Subject: [PATCH 3/4] Rename legacy solution to SampSharp.Legacy Agent-Logs-Url: https://github.com/ikkentim/SampSharp/sessions/d24e3568-200f-4535-91d2-7ef037ae3f95 Co-authored-by: ikkentim <2820647+ikkentim@users.noreply.github.com> --- build.cmd | 4 ++-- build.sh | 8 ++++---- src/legacy/{SampSharp.slnx => SampSharp.Legacy.slnx} | 0 ...slnx.DotSettings => SampSharp.Legacy.slnx.DotSettings} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename src/legacy/{SampSharp.slnx => SampSharp.Legacy.slnx} (100%) rename src/legacy/{SampSharp.slnx.DotSettings => SampSharp.Legacy.slnx.DotSettings} (100%) diff --git a/build.cmd b/build.cmd index b09a72cf..5c15255e 100644 --- a/build.cmd +++ b/build.cmd @@ -99,7 +99,7 @@ exit /b 1 cd /d "%SCRIPTDIR%src\legacy" echo. echo Building C# libraries... -dotnet build SampSharp.slnx -c Release +dotnet build SampSharp.Legacy.slnx -c Release if errorlevel 1 exit /b 1 exit /b 0 @@ -107,7 +107,7 @@ exit /b 0 cd /d "%SCRIPTDIR%src\legacy" echo. echo Packing C# libraries... -dotnet pack SampSharp.slnx -c Release +dotnet pack SampSharp.Legacy.slnx -c Release if errorlevel 1 exit /b 1 echo. echo NuGet packages created in: %SCRIPTDIR%build\artifacts\packages diff --git a/build.sh b/build.sh index 594c2639..38d85298 100755 --- a/build.sh +++ b/build.sh @@ -56,9 +56,9 @@ build_legacy_libraries() { echo "" echo "Building C# libraries..." if [ -n "$CiVersion" ]; then - dotnet build SampSharp.slnx -c Release "/p:CiVersion=$CiVersion" + dotnet build SampSharp.Legacy.slnx -c Release "/p:CiVersion=$CiVersion" else - dotnet build SampSharp.slnx -c Release + dotnet build SampSharp.Legacy.slnx -c Release fi } @@ -69,9 +69,9 @@ pack_legacy_libraries() { echo "" echo "Packing C# libraries..." if [ -n "$CiVersion" ]; then - dotnet pack SampSharp.slnx -c Release "/p:CiVersion=$CiVersion" + dotnet pack SampSharp.Legacy.slnx -c Release "/p:CiVersion=$CiVersion" else - dotnet pack SampSharp.slnx -c Release + dotnet pack SampSharp.Legacy.slnx -c Release fi echo "" diff --git a/src/legacy/SampSharp.slnx b/src/legacy/SampSharp.Legacy.slnx similarity index 100% rename from src/legacy/SampSharp.slnx rename to src/legacy/SampSharp.Legacy.slnx diff --git a/src/legacy/SampSharp.slnx.DotSettings b/src/legacy/SampSharp.Legacy.slnx.DotSettings similarity index 100% rename from src/legacy/SampSharp.slnx.DotSettings rename to src/legacy/SampSharp.Legacy.slnx.DotSettings From 48e1fb72877390293eed0dd3d6310adfb8f9c78a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Apr 2026 16:59:19 +0000 Subject: [PATCH 4/4] Add Directory.Packages.props to slnx solution items Agent-Logs-Url: https://github.com/ikkentim/SampSharp/sessions/6ee3cfae-6c08-48e2-9de4-3256dd4c824a Co-authored-by: ikkentim <2820647+ikkentim@users.noreply.github.com> --- SampSharp.slnx | 1 + src/legacy/SampSharp.Legacy.slnx | 1 + 2 files changed, 2 insertions(+) diff --git a/SampSharp.slnx b/SampSharp.slnx index 78c11c30..62b12ab6 100644 --- a/SampSharp.slnx +++ b/SampSharp.slnx @@ -14,6 +14,7 @@ + diff --git a/src/legacy/SampSharp.Legacy.slnx b/src/legacy/SampSharp.Legacy.slnx index b2432ef7..49a14531 100644 --- a/src/legacy/SampSharp.Legacy.slnx +++ b/src/legacy/SampSharp.Legacy.slnx @@ -1,6 +1,7 @@ +