diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d2dad90e..07a38798 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -63,7 +63,7 @@ jobs: path: artifacts/NeonShooter-Windows/** - name: Build Windows Binary for Platformer2D - run: dotnet publish Platformer2D/Windows/Platformer2D.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/Platformer2D-Windows + run: dotnet publish Platformer2D/Windows/Windows.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/Platformer2D-Windows - name: Archive Platformer2D uses: actions/upload-artifact@v6 @@ -108,7 +108,7 @@ jobs: dotnet-version: 9.0.x - name: Setup for MonoGame - uses: infinitespace-studios/monogame-actions/install-wine@v1.0 + uses: monogame/monogame-actions/install-wine@v1 - name: Install MonoPack run: dotnet tool install --global MonoPack @@ -180,7 +180,7 @@ jobs: path: artifacts/NeonShooter/*-universal.tar.gz - name: Build and Package Platformer2D - run: monopack -p Platformer2D/Desktop/Platformer2D.csproj -o ./artifacts/Platformer2D -rids win-x64,linux-x64,osx-x64,osx-arm64 -i Platformer2D/Desktop/Info.plist -c Platformer2D/Desktop/Platformer2D.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true" + run: monopack -p Platformer2D/Desktop/Desktop.csproj -o ./artifacts/Platformer2D -rids win-x64,linux-x64,osx-x64,osx-arm64 -i Platformer2D/Desktop/Info.plist -c Platformer2D/Desktop/Platformer2D.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true" - name: Archive Platformer2D Windows uses: actions/upload-artifact@v6 @@ -293,7 +293,7 @@ jobs: path: NeonShooter/NeonShooter.Android/bin/Release/net9.0-android/**/*-Signed.apk - name: Build Android Binary for Platformer2D - run: dotnet build Platformer2D/Android/Platformer2D.csproj -c Release + run: dotnet build Platformer2D/Android/Android.csproj -c Release - name: Archive Platformer2D Android uses: actions/upload-artifact@v6 diff --git a/AutoPong/AutoPong.Android/AutoPong.Android.csproj b/AutoPong/AutoPong.Android/AutoPong.Android.csproj index 1cb478ec..beec7f44 100644 --- a/AutoPong/AutoPong.Android/AutoPong.Android.csproj +++ b/AutoPong/AutoPong.Android/AutoPong.Android.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/AutoPong/AutoPong.Core/AutoPong.Core.csproj b/AutoPong/AutoPong.Core/AutoPong.Core.csproj index 7f455438..ef841a39 100644 --- a/AutoPong/AutoPong.Core/AutoPong.Core.csproj +++ b/AutoPong/AutoPong.Core/AutoPong.Core.csproj @@ -3,7 +3,7 @@ net9.0 - + All diff --git a/AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj b/AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj index 1008f7c2..f5945d15 100644 --- a/AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj +++ b/AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj b/AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj index aca3b1bc..457bb646 100644 --- a/AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj +++ b/AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/AutoPong/AutoPong.iOS/AutoPong.iOS.csproj b/AutoPong/AutoPong.iOS/AutoPong.iOS.csproj index 5436db5b..a2aceb35 100644 --- a/AutoPong/AutoPong.iOS/AutoPong.iOS.csproj +++ b/AutoPong/AutoPong.iOS/AutoPong.iOS.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/FuelCell/FuelCell.Android/FuelCell.Android.csproj b/FuelCell/FuelCell.Android/FuelCell.Android.csproj index b53e6efc..7bd88658 100644 --- a/FuelCell/FuelCell.Android/FuelCell.Android.csproj +++ b/FuelCell/FuelCell.Android/FuelCell.Android.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/FuelCell/FuelCell.Core/FuelCell.Core.csproj b/FuelCell/FuelCell.Core/FuelCell.Core.csproj index b435112b..dbe65e22 100644 --- a/FuelCell/FuelCell.Core/FuelCell.Core.csproj +++ b/FuelCell/FuelCell.Core/FuelCell.Core.csproj @@ -4,7 +4,7 @@ AnyCPU;x64 - + All diff --git a/FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj b/FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj index 45874fb3..09dd1d2f 100644 --- a/FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj +++ b/FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj b/FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj index 4632e720..808e58bb 100644 --- a/FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj +++ b/FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/FuelCell/FuelCell.iOS/FuelCell.iOS.csproj b/FuelCell/FuelCell.iOS/FuelCell.iOS.csproj index 274688e9..8c643b1c 100644 --- a/FuelCell/FuelCell.iOS/FuelCell.iOS.csproj +++ b/FuelCell/FuelCell.iOS/FuelCell.iOS.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj b/NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj index de296c44..fecff34d 100644 --- a/NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj +++ b/NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/NeonShooter/NeonShooter.Core/NeonShooter.Core.csproj b/NeonShooter/NeonShooter.Core/NeonShooter.Core.csproj index d4399c5a..44f6ef46 100644 --- a/NeonShooter/NeonShooter.Core/NeonShooter.Core.csproj +++ b/NeonShooter/NeonShooter.Core/NeonShooter.Core.csproj @@ -14,7 +14,7 @@ - + All diff --git a/NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.csproj b/NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.csproj index 5c3a2cb2..bb4d381d 100644 --- a/NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.csproj +++ b/NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj b/NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj index fc5f886e..34979a4e 100644 --- a/NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj +++ b/NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/NeonShooter/NeonShooter.iOS/NeonShooter.iOS.csproj b/NeonShooter/NeonShooter.iOS/NeonShooter.iOS.csproj index a9cc7297..8f9033db 100644 --- a/NeonShooter/NeonShooter.iOS/NeonShooter.iOS.csproj +++ b/NeonShooter/NeonShooter.iOS/NeonShooter.iOS.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/Platformer2D/Android/Platformer2D.csproj b/Platformer2D/Android/Android.csproj similarity index 94% rename from Platformer2D/Android/Platformer2D.csproj rename to Platformer2D/Android/Android.csproj index 4026fa3c..5558a1ee 100644 --- a/Platformer2D/Android/Platformer2D.csproj +++ b/Platformer2D/Android/Android.csproj @@ -18,7 +18,7 @@ - - + + \ No newline at end of file diff --git a/Platformer2D/Core/Core.csproj b/Platformer2D/Core/Core.csproj index acd35dee..f7cb8ee9 100644 --- a/Platformer2D/Core/Core.csproj +++ b/Platformer2D/Core/Core.csproj @@ -5,7 +5,7 @@ Platformer2D.Core - + All diff --git a/Platformer2D/Desktop/Platformer2D.csproj b/Platformer2D/Desktop/Desktop.csproj similarity index 95% rename from Platformer2D/Desktop/Platformer2D.csproj rename to Platformer2D/Desktop/Desktop.csproj index 75b70843..d0376a6a 100644 --- a/Platformer2D/Desktop/Platformer2D.csproj +++ b/Platformer2D/Desktop/Desktop.csproj @@ -21,7 +21,7 @@ - - + + \ No newline at end of file diff --git a/Platformer2D/Platformer2D.sln b/Platformer2D/Platformer2D.sln deleted file mode 100644 index f310fb81..00000000 --- a/Platformer2D/Platformer2D.sln +++ /dev/null @@ -1,63 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34723.18 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Platformer2D.Android", "Android\Platformer2D.csproj", "{6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Platformer2D.iOS", "iOS\Platformer2D.csproj", "{109593E3-17AE-4482-9556-4B2068F9479B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Platformer2D.Core", "Core\Core.csproj", "{47BD21C1-2170-456C-AF98-6D92C5F73BA9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Platformer2D.DesktopGL", "Desktop\Platformer2D.csproj", "{85B968E5-2E46-45A3-AD10-1F3F1FB6F9B6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Platformer2D.Windows", "Windows\Platformer2D.csproj", "{A7C9F312-8D3E-4B5A-9C1E-6F8B2D4E3A91}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{B4A0E918-51B4-40FF-9845-60F2616B3F27}" -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 - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}.Release|Any CPU.Build.0 = Release|Any CPU - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3}.Release|Any CPU.Deploy.0 = Release|Any CPU - {109593E3-17AE-4482-9556-4B2068F9479B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {109593E3-17AE-4482-9556-4B2068F9479B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {109593E3-17AE-4482-9556-4B2068F9479B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {109593E3-17AE-4482-9556-4B2068F9479B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {109593E3-17AE-4482-9556-4B2068F9479B}.Release|Any CPU.Build.0 = Release|Any CPU - {109593E3-17AE-4482-9556-4B2068F9479B}.Release|Any CPU.Deploy.0 = Release|Any CPU - {47BD21C1-2170-456C-AF98-6D92C5F73BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47BD21C1-2170-456C-AF98-6D92C5F73BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47BD21C1-2170-456C-AF98-6D92C5F73BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47BD21C1-2170-456C-AF98-6D92C5F73BA9}.Release|Any CPU.Build.0 = Release|Any CPU - {85B968E5-2E46-45A3-AD10-1F3F1FB6F9B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85B968E5-2E46-45A3-AD10-1F3F1FB6F9B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85B968E5-2E46-45A3-AD10-1F3F1FB6F9B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85B968E5-2E46-45A3-AD10-1F3F1FB6F9B6}.Release|Any CPU.Build.0 = Release|Any CPU - {A7C9F312-8D3E-4B5A-9C1E-6F8B2D4E3A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7C9F312-8D3E-4B5A-9C1E-6F8B2D4E3A91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7C9F312-8D3E-4B5A-9C1E-6F8B2D4E3A91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7C9F312-8D3E-4B5A-9C1E-6F8B2D4E3A91}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {6161B64E-0BF7-42D9-B2BA-6BB16460BFE3} = {B4A0E918-51B4-40FF-9845-60F2616B3F27} - {109593E3-17AE-4482-9556-4B2068F9479B} = {B4A0E918-51B4-40FF-9845-60F2616B3F27} - {85B968E5-2E46-45A3-AD10-1F3F1FB6F9B6} = {B4A0E918-51B4-40FF-9845-60F2616B3F27} - {A7C9F312-8D3E-4B5A-9C1E-6F8B2D4E3A91} = {B4A0E918-51B4-40FF-9845-60F2616B3F27} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {51ECE597-0299-4753-B7F5-4E8EDECD7BB4} - EndGlobalSection -EndGlobal diff --git a/Platformer2D/Platformer2D.slnx b/Platformer2D/Platformer2D.slnx new file mode 100644 index 00000000..e6c29179 --- /dev/null +++ b/Platformer2D/Platformer2D.slnx @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/Platformer2D/Windows/Platformer2D.csproj b/Platformer2D/Windows/Windows.csproj similarity index 94% rename from Platformer2D/Windows/Platformer2D.csproj rename to Platformer2D/Windows/Windows.csproj index cd4212b4..62aee9fe 100644 --- a/Platformer2D/Windows/Platformer2D.csproj +++ b/Platformer2D/Windows/Windows.csproj @@ -20,7 +20,7 @@ - - + + \ No newline at end of file diff --git a/Platformer2D/iOS/Platformer2D.csproj b/Platformer2D/iOS/iOS.csproj similarity index 94% rename from Platformer2D/iOS/Platformer2D.csproj rename to Platformer2D/iOS/iOS.csproj index e832ea18..858a305e 100644 --- a/Platformer2D/iOS/Platformer2D.csproj +++ b/Platformer2D/iOS/iOS.csproj @@ -16,7 +16,7 @@ - - + + diff --git a/ShipGame/ShipGame.Android/ShipGame.Android.csproj b/ShipGame/ShipGame.Android/ShipGame.Android.csproj index 8eaedafe..f57ce896 100644 --- a/ShipGame/ShipGame.Android/ShipGame.Android.csproj +++ b/ShipGame/ShipGame.Android/ShipGame.Android.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/ShipGame/ShipGame.Core/ShipGame.Core.csproj b/ShipGame/ShipGame.Core/ShipGame.Core.csproj index bef087ca..c8180cf7 100644 --- a/ShipGame/ShipGame.Core/ShipGame.Core.csproj +++ b/ShipGame/ShipGame.Core/ShipGame.Core.csproj @@ -4,7 +4,7 @@ AnyCPU;x64 - + All diff --git a/ShipGame/ShipGame.Dependencies/BoxCollider/BoxCollider.csproj b/ShipGame/ShipGame.Dependencies/BoxCollider/BoxCollider.csproj index 36939d70..1e6ed1e0 100644 --- a/ShipGame/ShipGame.Dependencies/BoxCollider/BoxCollider.csproj +++ b/ShipGame/ShipGame.Dependencies/BoxCollider/BoxCollider.csproj @@ -3,7 +3,7 @@ net9.0 - + All diff --git a/ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj b/ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj index b2d7e26b..51e9d03f 100644 --- a/ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj +++ b/ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj @@ -3,8 +3,8 @@ net8.0 - - + + All diff --git a/ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.csproj b/ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.csproj index ba771eee..286a41f6 100644 --- a/ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.csproj +++ b/ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj b/ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj index 6912014a..2c63e7d7 100644 --- a/ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj +++ b/ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/ShipGame/ShipGame.iOS/ShipGame.iOS.csproj b/ShipGame/ShipGame.iOS/ShipGame.iOS.csproj index 79fe05f4..4e7f8990 100644 --- a/ShipGame/ShipGame.iOS/ShipGame.iOS.csproj +++ b/ShipGame/ShipGame.iOS/ShipGame.iOS.csproj @@ -15,8 +15,8 @@ - - + +