diff --git a/.gitmodules b/.gitmodules index 6f98b12..7515ff9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "FNA"] - path = FNA + path = ThirdParty/FNA url = https://github.com/FNA-XNA/FNA [submodule "FontStashSharp"] - path = FontStashSharp + path = ThirdParty/FontStashSharp url = https://github.com/FontStashSharp/FontStashSharp diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 19827c2..36fd5ac 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -5,7 +5,7 @@ # install xvfb to allow for graphics-dependent tests - apt-get update && apt-get install -y --no-install-recommends xauth xvfb openjdk-11-jdk # install dotnet - - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 7.0.305 + - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0 - export DOTNET_ROOT=$HOME/.dotnet - export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools # run cake diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index 288eb25..2338bcf 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -1,6 +1,6 @@ steps: document: - image: mcr.microsoft.com/dotnet/sdk:7.0.305 + image: mcr.microsoft.com/dotnet/sdk:8.0-jammy commands: - dotnet tool restore - dotnet cake --target Document --branch $CI_COMMIT_BRANCH diff --git a/Demos.Android/Demos.Android.csproj b/Demos.Android/Demos.Android.csproj index c915abd..6cf9df3 100644 --- a/Demos.Android/Demos.Android.csproj +++ b/Demos.Android/Demos.Android.csproj @@ -1,6 +1,6 @@ - net7.0-android + net8.0-android 31 Exe de.ellpeck.mlem.demos.android diff --git a/Demos.DesktopGL/Demos.DesktopGL.FNA.csproj b/Demos.DesktopGL/Demos.DesktopGL.FNA.csproj index 8129d37..80e79e8 100644 --- a/Demos.DesktopGL/Demos.DesktopGL.FNA.csproj +++ b/Demos.DesktopGL/Demos.DesktopGL.FNA.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 Icon.ico MLEM Desktop Demos Demos.DesktopGL @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + PreserveNewest %(Filename)%(Extension) diff --git a/Demos.DesktopGL/Demos.DesktopGL.csproj b/Demos.DesktopGL/Demos.DesktopGL.csproj index f861a8c..4e721e8 100644 --- a/Demos.DesktopGL/Demos.DesktopGL.csproj +++ b/Demos.DesktopGL/Demos.DesktopGL.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 Icon.ico MLEM Desktop Demos false diff --git a/Demos/Demos.FNA.csproj b/Demos/Demos.FNA.csproj index a15422e..dbb05db 100644 --- a/Demos/Demos.FNA.csproj +++ b/Demos/Demos.FNA.csproj @@ -14,7 +14,7 @@ - + all diff --git a/MLEM.Data/MLEM.Data.FNA.csproj b/MLEM.Data/MLEM.Data.FNA.csproj index e4660a8..8d39ad0 100644 --- a/MLEM.Data/MLEM.Data.FNA.csproj +++ b/MLEM.Data/MLEM.Data.FNA.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true @@ -35,7 +35,7 @@ all - + all diff --git a/MLEM.Data/MLEM.Data.csproj b/MLEM.Data/MLEM.Data.csproj index bce3939..5300f97 100644 --- a/MLEM.Data/MLEM.Data.csproj +++ b/MLEM.Data/MLEM.Data.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true diff --git a/MLEM.Extended/MLEM.Extended.FNA.csproj b/MLEM.Extended/MLEM.Extended.FNA.csproj index a4e90a4..58d1b29 100644 --- a/MLEM.Extended/MLEM.Extended.FNA.csproj +++ b/MLEM.Extended/MLEM.Extended.FNA.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net7.0 + netstandard2.0;net8.0 true true true @@ -24,10 +24,10 @@ - + all - + all diff --git a/MLEM.Extended/MLEM.Extended.csproj b/MLEM.Extended/MLEM.Extended.csproj index 8c45f4e..72798a3 100644 --- a/MLEM.Extended/MLEM.Extended.csproj +++ b/MLEM.Extended/MLEM.Extended.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net7.0 + netstandard2.0;net8.0 true true true diff --git a/MLEM.FNA.sln b/MLEM.FNA.sln index d4e2539..f1f9d6b 100644 --- a/MLEM.FNA.sln +++ b/MLEM.FNA.sln @@ -16,11 +16,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.FNA", "Tests\Tests.FN EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MLEM.Extended.FNA", "MLEM.Extended\MLEM.Extended.FNA.csproj", "{A5B22930-DF4B-4A62-93ED-A6549F7B666B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "ThirdParty\FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontStashSharp.FNA", "FontStashSharp\src\XNA\FontStashSharp.FNA.csproj", "{39249E92-EBF2-4951-A086-AB4951C3CCE1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontStashSharp.FNA", "ThirdParty\FontStashSharp\src\XNA\FontStashSharp.FNA.csproj", "{39249E92-EBF2-4951-A086-AB4951C3CCE1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA.Core", "FNA\FNA.Core.csproj", "{458FFA5E-A1C4-4B23-A5D8-259385FEECED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA.Core", "ThirdParty\FNA\FNA.Core.csproj", "{458FFA5E-A1C4-4B23-A5D8-259385FEECED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MLEM.Startup/MLEM.Startup.FNA.csproj b/MLEM.Startup/MLEM.Startup.FNA.csproj index 8ca60a1..5f96f32 100644 --- a/MLEM.Startup/MLEM.Startup.FNA.csproj +++ b/MLEM.Startup/MLEM.Startup.FNA.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true @@ -26,7 +26,7 @@ - + all diff --git a/MLEM.Startup/MLEM.Startup.csproj b/MLEM.Startup/MLEM.Startup.csproj index 4d22b29..2809bf1 100644 --- a/MLEM.Startup/MLEM.Startup.csproj +++ b/MLEM.Startup/MLEM.Startup.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true diff --git a/MLEM.Templates/MLEM.Templates.csproj b/MLEM.Templates/MLEM.Templates.csproj index 8bc7684..88428cc 100644 --- a/MLEM.Templates/MLEM.Templates.csproj +++ b/MLEM.Templates/MLEM.Templates.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true false content diff --git a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj index 41fa2bf..0d139e4 100644 --- a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj +++ b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 false false Icon.ico diff --git a/MLEM.Ui/MLEM.Ui.FNA.csproj b/MLEM.Ui/MLEM.Ui.FNA.csproj index 34c8c01..141c611 100644 --- a/MLEM.Ui/MLEM.Ui.FNA.csproj +++ b/MLEM.Ui/MLEM.Ui.FNA.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true @@ -24,7 +24,7 @@ - + all diff --git a/MLEM.Ui/MLEM.Ui.csproj b/MLEM.Ui/MLEM.Ui.csproj index 6da4337..3819d89 100644 --- a/MLEM.Ui/MLEM.Ui.csproj +++ b/MLEM.Ui/MLEM.Ui.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true diff --git a/MLEM/MLEM.FNA.csproj b/MLEM/MLEM.FNA.csproj index 38c9b88..9bd81dc 100644 --- a/MLEM/MLEM.FNA.csproj +++ b/MLEM/MLEM.FNA.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true @@ -21,7 +21,7 @@ - + all diff --git a/MLEM/MLEM.csproj b/MLEM/MLEM.csproj index b71a05a..5015c5e 100644 --- a/MLEM/MLEM.csproj +++ b/MLEM/MLEM.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net7.0 + net452;netstandard2.0;net8.0 true true true diff --git a/Sandbox/Sandbox.csproj b/Sandbox/Sandbox.csproj index ec2d3f8..7ea7258 100644 --- a/Sandbox/Sandbox.csproj +++ b/Sandbox/Sandbox.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 false diff --git a/Tests/Tests.FNA.csproj b/Tests/Tests.FNA.csproj index 8f05bc6..7ce18a8 100644 --- a/Tests/Tests.FNA.csproj +++ b/Tests/Tests.FNA.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 nunit TestResults.FNA Tests.FNA.runsettings @@ -18,7 +18,7 @@ - + @@ -35,7 +35,7 @@ PreserveNewest - + PreserveNewest %(Filename)%(Extension) diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 840ecd4..c4f10d0 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 nunit TestResults Tests.runsettings diff --git a/FNA b/ThirdParty/FNA similarity index 100% rename from FNA rename to ThirdParty/FNA diff --git a/FontStashSharp b/ThirdParty/FontStashSharp similarity index 100% rename from FontStashSharp rename to ThirdParty/FontStashSharp diff --git a/FnaNative/FAudio.dll b/ThirdParty/Native/FAudio.dll similarity index 100% rename from FnaNative/FAudio.dll rename to ThirdParty/Native/FAudio.dll diff --git a/FnaNative/FNA3D.dll b/ThirdParty/Native/FNA3D.dll similarity index 100% rename from FnaNative/FNA3D.dll rename to ThirdParty/Native/FNA3D.dll diff --git a/FnaNative/SDL2.dll b/ThirdParty/Native/SDL2.dll similarity index 100% rename from FnaNative/SDL2.dll rename to ThirdParty/Native/SDL2.dll diff --git a/FnaNative/libFAudio.0.dylib b/ThirdParty/Native/libFAudio.0.dylib similarity index 100% rename from FnaNative/libFAudio.0.dylib rename to ThirdParty/Native/libFAudio.0.dylib diff --git a/FnaNative/libFAudio.so.0 b/ThirdParty/Native/libFAudio.so.0 similarity index 100% rename from FnaNative/libFAudio.so.0 rename to ThirdParty/Native/libFAudio.so.0 diff --git a/FnaNative/libFNA3D.0.dylib b/ThirdParty/Native/libFNA3D.0.dylib similarity index 100% rename from FnaNative/libFNA3D.0.dylib rename to ThirdParty/Native/libFNA3D.0.dylib diff --git a/FnaNative/libFNA3D.so.0 b/ThirdParty/Native/libFNA3D.so.0 similarity index 100% rename from FnaNative/libFNA3D.so.0 rename to ThirdParty/Native/libFNA3D.so.0 diff --git a/FnaNative/libMoltenVK.dylib b/ThirdParty/Native/libMoltenVK.dylib similarity index 100% rename from FnaNative/libMoltenVK.dylib rename to ThirdParty/Native/libMoltenVK.dylib diff --git a/FnaNative/libSDL2-2.0.0.dylib b/ThirdParty/Native/libSDL2-2.0.0.dylib similarity index 100% rename from FnaNative/libSDL2-2.0.0.dylib rename to ThirdParty/Native/libSDL2-2.0.0.dylib diff --git a/FnaNative/libSDL2-2.0.so.0 b/ThirdParty/Native/libSDL2-2.0.so.0 similarity index 100% rename from FnaNative/libSDL2-2.0.so.0 rename to ThirdParty/Native/libSDL2-2.0.so.0 diff --git a/FnaNative/libtheorafile.dll b/ThirdParty/Native/libtheorafile.dll similarity index 100% rename from FnaNative/libtheorafile.dll rename to ThirdParty/Native/libtheorafile.dll diff --git a/FnaNative/libtheorafile.dylib b/ThirdParty/Native/libtheorafile.dylib similarity index 100% rename from FnaNative/libtheorafile.dylib rename to ThirdParty/Native/libtheorafile.dylib diff --git a/FnaNative/libtheorafile.so b/ThirdParty/Native/libtheorafile.so similarity index 100% rename from FnaNative/libtheorafile.so rename to ThirdParty/Native/libtheorafile.so diff --git a/FnaNative/libvulkan.1.dylib b/ThirdParty/Native/libvulkan.1.dylib similarity index 100% rename from FnaNative/libvulkan.1.dylib rename to ThirdParty/Native/libvulkan.1.dylib