updated to .net 8 and reorganized third party deps

2024-11-21 20:43:29 +01:00 · 2023-11-22 10:39:13 +01:00 · 2023-11-22 10:39:13 +01:00 · b8f46ff5d2
commit b8f46ff5d2
parent 56a4833a49
39 changed files with 36 additions and 36 deletions
--- 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
--- 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
--- 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
--- a/Demos.Android/Demos.Android.csproj
+++ b/Demos.Android/Demos.Android.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net7.0-android</TargetFramework>
+        <TargetFramework>net8.0-android</TargetFramework>
        <SupportedOSPlatformVersion>31</SupportedOSPlatformVersion>
        <OutputType>Exe</OutputType>
        <ApplicationId>de.ellpeck.mlem.demos.android</ApplicationId>
--- a/Demos.DesktopGL/Demos.DesktopGL.FNA.csproj
+++ b/Demos.DesktopGL/Demos.DesktopGL.FNA.csproj
@ -2,7 +2,7 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <ApplicationIcon>Icon.ico</ApplicationIcon>
        <AssemblyName>MLEM Desktop Demos</AssemblyName>
        <RootNamespace>Demos.DesktopGL</RootNamespace>
@ -21,7 +21,7 @@

    <ItemGroup>
        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
-        <ProjectReference Include="..\FNA\FNA.Core.csproj" />
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.Core.csproj" />
    </ItemGroup>

    <ItemGroup>
@ -29,7 +29,7 @@
        <Content Include="..\Demos\Content\*\**" />
        <EmbeddedResource Include="Icon.ico" />
        <EmbeddedResource Include="Icon.bmp" />
-        <Content Include="../FnaNative/**">
+        <Content Include="../ThirdParty/Native/**">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
            <Link>%(Filename)%(Extension)</Link>
        </Content>
--- a/Demos.DesktopGL/Demos.DesktopGL.csproj
+++ b/Demos.DesktopGL/Demos.DesktopGL.csproj
@ -2,7 +2,7 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <ApplicationIcon>Icon.ico</ApplicationIcon>
        <AssemblyName>MLEM Desktop Demos</AssemblyName>
        <IsPackable>false</IsPackable>
--- a/Demos/Demos.FNA.csproj
+++ b/Demos/Demos.FNA.csproj
@ -14,7 +14,7 @@
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\FNA\FNA.Core.csproj">
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.Core.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>
    </ItemGroup>
--- a/MLEM.Data/MLEM.Data.FNA.csproj
+++ b/MLEM.Data/MLEM.Data.FNA.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
@ -35,7 +35,7 @@
            <PrivateAssets>all</PrivateAssets>
        </PackageReference>

-        <ProjectReference Include="..\FNA\FNA.csproj">
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>
    </ItemGroup>
--- a/MLEM.Data/MLEM.Data.csproj
+++ b/MLEM.Data/MLEM.Data.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
--- a/MLEM.Extended/MLEM.Extended.FNA.csproj
+++ b/MLEM.Extended/MLEM.Extended.FNA.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
@ -24,10 +24,10 @@
    <ItemGroup>
        <ProjectReference Include="..\MLEM\MLEM.FNA.csproj" />

-        <ProjectReference Include="..\FontStashSharp\src\XNA\FontStashSharp.FNA.csproj">
+        <ProjectReference Include="..\ThirdParty\FontStashSharp\src\XNA\FontStashSharp.FNA.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>
-        <ProjectReference Include="..\FNA\FNA.csproj">
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>

--- a/MLEM.Extended/MLEM.Extended.csproj
+++ b/MLEM.Extended/MLEM.Extended.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
--- 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
--- a/MLEM.Startup/MLEM.Startup.FNA.csproj
+++ b/MLEM.Startup/MLEM.Startup.FNA.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
@ -26,7 +26,7 @@
        <ProjectReference Include="..\MLEM.Ui\MLEM.Ui.FNA.csproj" />
        <ProjectReference Include="..\MLEM\MLEM.FNA.csproj" />

-        <ProjectReference Include="..\FNA\FNA.csproj">
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>
    </ItemGroup>
--- a/MLEM.Startup/MLEM.Startup.csproj
+++ b/MLEM.Startup/MLEM.Startup.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
--- a/MLEM.Templates/MLEM.Templates.csproj
+++ b/MLEM.Templates/MLEM.Templates.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <IncludeContentInPack>true</IncludeContentInPack>
        <IncludeBuildOutput>false</IncludeBuildOutput>
        <ContentTargetFolders>content</ContentTargetFolders>
--- a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
+++ b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
@ -2,7 +2,7 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <PublishReadyToRun>false</PublishReadyToRun>
        <TieredCompilation>false</TieredCompilation>
        <ApplicationIcon>Icon.ico</ApplicationIcon>
--- a/MLEM.Ui/MLEM.Ui.FNA.csproj
+++ b/MLEM.Ui/MLEM.Ui.FNA.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
@ -24,7 +24,7 @@
        <PackageReference Include="TextCopy" Version="6.2.0" Condition="'$(TargetFramework)'!='net452'" />
        <ProjectReference Include="..\MLEM\MLEM.FNA.csproj" />

-        <ProjectReference Include="..\FNA\FNA.csproj">
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>
    </ItemGroup>
--- a/MLEM.Ui/MLEM.Ui.csproj
+++ b/MLEM.Ui/MLEM.Ui.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
--- a/MLEM/MLEM.FNA.csproj
+++ b/MLEM/MLEM.FNA.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
@ -21,7 +21,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\FNA\FNA.csproj">
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.csproj">
            <PrivateAssets>all</PrivateAssets>
        </ProjectReference>

--- a/MLEM/MLEM.csproj
+++ b/MLEM/MLEM.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
        <IsTrimmable>true</IsTrimmable>
--- a/Sandbox/Sandbox.csproj
+++ b/Sandbox/Sandbox.csproj
@ -2,7 +2,7 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <IsPackable>false</IsPackable>
    </PropertyGroup>

--- a/Tests/Tests.FNA.csproj
+++ b/Tests/Tests.FNA.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <VSTestLogger>nunit</VSTestLogger>
        <VSTestResultsDirectory>TestResults.FNA</VSTestResultsDirectory>
        <RunSettingsFilePath>Tests.FNA.runsettings</RunSettingsFilePath>
@ -18,7 +18,7 @@
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\FNA\FNA.Core.csproj" />
+        <ProjectReference Include="..\ThirdParty\FNA\FNA.Core.csproj" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

        <PackageReference Include="coverlet.collector" Version="6.0.0">
@ -35,7 +35,7 @@
        <Content Include="Content/**">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
        </Content>
-        <Content Include="../FnaNative/**">
+        <Content Include="../ThirdParty/Native/**">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
            <Link>%(Filename)%(Extension)</Link>
        </Content>
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <VSTestLogger>nunit</VSTestLogger>
        <VSTestResultsDirectory>TestResults</VSTestResultsDirectory>
        <RunSettingsFilePath>Tests.runsettings</RunSettingsFilePath>
--- a/ThirdParty/FNA
+++ b/ThirdParty/FNA
--- a/ThirdParty/FontStashSharp
+++ b/ThirdParty/FontStashSharp
--- a/ThirdParty/Native/FAudio.dll
+++ b/ThirdParty/Native/FAudio.dll
--- a/ThirdParty/Native/FNA3D.dll
+++ b/ThirdParty/Native/FNA3D.dll
--- a/ThirdParty/Native/SDL2.dll
+++ b/ThirdParty/Native/SDL2.dll
--- a/ThirdParty/Native/libFAudio.0.dylib
+++ b/ThirdParty/Native/libFAudio.0.dylib
--- a/ThirdParty/Native/libFAudio.so.0
+++ b/ThirdParty/Native/libFAudio.so.0
--- a/ThirdParty/Native/libFNA3D.0.dylib
+++ b/ThirdParty/Native/libFNA3D.0.dylib
--- a/ThirdParty/Native/libFNA3D.so.0
+++ b/ThirdParty/Native/libFNA3D.so.0
--- a/ThirdParty/Native/libMoltenVK.dylib
+++ b/ThirdParty/Native/libMoltenVK.dylib
--- a/ThirdParty/Native/libSDL2-2.0.0.dylib
+++ b/ThirdParty/Native/libSDL2-2.0.0.dylib
--- a/ThirdParty/Native/libSDL2-2.0.so.0
+++ b/ThirdParty/Native/libSDL2-2.0.so.0
--- a/ThirdParty/Native/libtheorafile.dll
+++ b/ThirdParty/Native/libtheorafile.dll
--- a/ThirdParty/Native/libtheorafile.dylib
+++ b/ThirdParty/Native/libtheorafile.dylib
--- a/ThirdParty/Native/libtheorafile.so
+++ b/ThirdParty/Native/libtheorafile.so
--- a/ThirdParty/Native/libvulkan.1.dylib
+++ b/ThirdParty/Native/libvulkan.1.dylib