diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 6e8e1cf9..d6ccc9d1 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -17,7 +17,7 @@ jobs: - name: "Clone Repository" uses: actions/checkout@v4 - name: "CAKE (Build -> Test -> Package)" - run: dotnet run --project ./build/Build.csproj -- --target=Default + run: dotnet run --project ./src/cs/Build/Build.csproj -- --target=Default - name: "Upload Artifacts For Deploy" if: github.event_name != 'pull_request' uses: actions/upload-artifact@main diff --git a/MonoGame.Extended.sln b/MonoGame.Extended.sln index 195a7acc..0ada71ab 100644 --- a/MonoGame.Extended.sln +++ b/MonoGame.Extended.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 @@ -43,11 +43,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoGame.Extended.Collision EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended", "src\cs\MonoGame.Extended\MonoGame.Extended.csproj", "{4170BBC0-BF49-4307-8272-768EEA77034A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{AAB81CB9-9C71-4499-A51E-933C384D6DBF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Tweening.Tests", "src\cs\Tests\MonoGame.Extended.Tweening.Tests\MonoGame.Extended.Tweening.Tests.csproj", "{DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Benchmarks.Collisions", "MonoGame.Extended.Benchmarks.Collisions\MonoGame.Extended.Benchmarks.Collisions.csproj", "{6B5939ED-E99D-4842-B4FE-A7624C59A60A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{5DC42D13-F2ED-48F9-8408-A28D9DACFCF4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Tweening.Tests", "MonoGame.Extended.Tweening.Tests\MonoGame.Extended.Tweening.Tests.csproj", "{A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "src\cs\Build\Build.csproj", "{91B0F8A8-9C6C-4779-AC75-228B9856B4A9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -193,22 +193,22 @@ Global {4170BBC0-BF49-4307-8272-768EEA77034A}.Release|Any CPU.Build.0 = Release|Any CPU {4170BBC0-BF49-4307-8272-768EEA77034A}.Release|x86.ActiveCfg = Release|Any CPU {4170BBC0-BF49-4307-8272-768EEA77034A}.Release|x86.Build.0 = Release|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Debug|x86.Build.0 = Debug|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Release|Any CPU.Build.0 = Release|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Release|x86.ActiveCfg = Release|Any CPU - {6B5939ED-E99D-4842-B4FE-A7624C59A60A}.Release|x86.Build.0 = Release|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Debug|x86.ActiveCfg = Debug|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Debug|x86.Build.0 = Debug|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Release|Any CPU.Build.0 = Release|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Release|x86.ActiveCfg = Release|Any CPU - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC}.Release|x86.Build.0 = Release|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Debug|x86.ActiveCfg = Debug|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Debug|x86.Build.0 = Debug|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Release|Any CPU.Build.0 = Release|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Release|x86.ActiveCfg = Release|Any CPU + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F}.Release|x86.Build.0 = Release|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Debug|x86.ActiveCfg = Debug|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Debug|x86.Build.0 = Debug|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Release|Any CPU.Build.0 = Release|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Release|x86.ActiveCfg = Release|Any CPU + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -221,8 +221,8 @@ Global {43CBA868-9BFC-4E02-8A7A-142C603B087E} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863} {34841DEB-EEC0-477C-B19D-CBB6DF49ED39} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863} {CB439E84-F0F6-4790-8CD1-8A66C3D7B4DA} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863} - {6B5939ED-E99D-4842-B4FE-A7624C59A60A} = {AAB81CB9-9C71-4499-A51E-933C384D6DBF} - {A1BD6FDC-5A76-4D14-8FDA-ACD153C8EBCC} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863} + {DAF853E1-57EE-4CD3-8CF9-4B49D733C58F} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863} + {91B0F8A8-9C6C-4779-AC75-228B9856B4A9} = {5DC42D13-F2ED-48F9-8408-A28D9DACFCF4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8ED5A62D-25EC-4331-9F99-BDD1E10C02A0} diff --git a/MonoGame.Extended.Benchmarks.Collisions/DifferentPoolSizeCollision.cs b/src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/DifferentPoolSizeCollision.cs similarity index 100% rename from MonoGame.Extended.Benchmarks.Collisions/DifferentPoolSizeCollision.cs rename to src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/DifferentPoolSizeCollision.cs diff --git a/MonoGame.Extended.Benchmarks.Collisions/MonoGame.Extended.Benchmarks.Collisions.csproj b/src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/MonoGame.Extended.Benchmarks.Collisions.csproj similarity index 100% rename from MonoGame.Extended.Benchmarks.Collisions/MonoGame.Extended.Benchmarks.Collisions.csproj rename to src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/MonoGame.Extended.Benchmarks.Collisions.csproj diff --git a/MonoGame.Extended.Benchmarks.Collisions/Program.cs b/src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/Program.cs similarity index 100% rename from MonoGame.Extended.Benchmarks.Collisions/Program.cs rename to src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/Program.cs diff --git a/MonoGame.Extended.Benchmarks.Collisions/SpaceAlgorithms.cs b/src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/SpaceAlgorithms.cs similarity index 100% rename from MonoGame.Extended.Benchmarks.Collisions/SpaceAlgorithms.cs rename to src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/SpaceAlgorithms.cs diff --git a/MonoGame.Extended.Benchmarks.Collisions/Utils/Collider.cs b/src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/Utils/Collider.cs similarity index 100% rename from MonoGame.Extended.Benchmarks.Collisions/Utils/Collider.cs rename to src/cs/Benchmarks/MonoGame.Extended.Benchmarks.Collisions/Utils/Collider.cs diff --git a/build/Build.csproj b/src/cs/Build/Build.csproj similarity index 100% rename from build/Build.csproj rename to src/cs/Build/Build.csproj diff --git a/build/BuildContext.cs b/src/cs/Build/BuildContext.cs similarity index 100% rename from build/BuildContext.cs rename to src/cs/Build/BuildContext.cs diff --git a/build/BuildTask.cs b/src/cs/Build/BuildTask.cs similarity index 100% rename from build/BuildTask.cs rename to src/cs/Build/BuildTask.cs diff --git a/build/DeployToGithubTask.cs b/src/cs/Build/DeployToGithubTask.cs similarity index 100% rename from build/DeployToGithubTask.cs rename to src/cs/Build/DeployToGithubTask.cs diff --git a/build/DeployToMyGetTask.cs b/src/cs/Build/DeployToMyGetTask.cs similarity index 100% rename from build/DeployToMyGetTask.cs rename to src/cs/Build/DeployToMyGetTask.cs diff --git a/build/DeployToNuGetTask.cs b/src/cs/Build/DeployToNuGetTask.cs similarity index 100% rename from build/DeployToNuGetTask.cs rename to src/cs/Build/DeployToNuGetTask.cs diff --git a/build/PackageTask.cs b/src/cs/Build/PackageTask.cs similarity index 100% rename from build/PackageTask.cs rename to src/cs/Build/PackageTask.cs diff --git a/build/Program.cs b/src/cs/Build/Program.cs similarity index 94% rename from build/Program.cs rename to src/cs/Build/Program.cs index 1603494a..b8131092 100644 --- a/build/Program.cs +++ b/src/cs/Build/Program.cs @@ -14,7 +14,7 @@ public static class Program { return new CakeHost() .UseContext() - .UseWorkingDirectory("../") + .UseWorkingDirectory("../../../") .Run(args); } } diff --git a/build/RestoreTask.cs b/src/cs/Build/RestoreTask.cs similarity index 100% rename from build/RestoreTask.cs rename to src/cs/Build/RestoreTask.cs diff --git a/build/TestTask.cs b/src/cs/Build/TestTask.cs similarity index 100% rename from build/TestTask.cs rename to src/cs/Build/TestTask.cs diff --git a/MonoGame.Extended.Tweening.Tests/ColorHandler.cs b/src/cs/Tests/MonoGame.Extended.Tweening.Tests/ColorHandler.cs similarity index 100% rename from MonoGame.Extended.Tweening.Tests/ColorHandler.cs rename to src/cs/Tests/MonoGame.Extended.Tweening.Tests/ColorHandler.cs diff --git a/MonoGame.Extended.Tweening.Tests/MonoGame.Extended.Tweening.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Tweening.Tests/MonoGame.Extended.Tweening.Tests.csproj similarity index 90% rename from MonoGame.Extended.Tweening.Tests/MonoGame.Extended.Tweening.Tests.csproj rename to src/cs/Tests/MonoGame.Extended.Tweening.Tests/MonoGame.Extended.Tweening.Tests.csproj index 9a2d97fe..467d4bc6 100644 --- a/MonoGame.Extended.Tweening.Tests/MonoGame.Extended.Tweening.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Tweening.Tests/MonoGame.Extended.Tweening.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/MonoGame.Extended.Tweening.Tests/TweenerTests.cs b/src/cs/Tests/MonoGame.Extended.Tweening.Tests/TweenerTests.cs similarity index 100% rename from MonoGame.Extended.Tweening.Tests/TweenerTests.cs rename to src/cs/Tests/MonoGame.Extended.Tweening.Tests/TweenerTests.cs