Upgrade to .NET 8

Mupen64-Rewrite · Oct 19, 2024 · be6be89 · be6be89
1 parent 3adb5a4
commit be6be89
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 54 deletions.
diff --git a/M64RPFW.Models.Types/M64RPFW.Models.Types.csproj b/M64RPFW.Models.Types/M64RPFW.Models.Types.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AssemblyVersion>0.1.0</AssemblyVersion>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/M64RPFW.Models/M64RPFW.Models.csproj b/M64RPFW.Models/M64RPFW.Models.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AssemblyVersion>0.1.0</AssemblyVersion>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -20,11 +20,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BitFaster.Caching" Version="2.4.0" />
-        <PackageReference Include="FFmpeg.AutoGen" Version="6.0.0.2" />
-        <PackageReference Include="NLua" Version="1.6.3" />
-        <PackageReference Include="Silk.NET.SDL" Version="2.19.0" />
-        <PackageReference Include="SkiaSharp" Version="2.88.6" />
+        <PackageReference Include="BitFaster.Caching" Version="2.5.2" />
+        <PackageReference Include="FFmpeg.AutoGen" Version="7.0.0" />
+        <PackageReference Include="NLua" Version="1.7.3" />
+        <PackageReference Include="Silk.NET.SDL" Version="2.21.0" />
+        <PackageReference Include="SkiaSharp" Version="2.88.8" />
         <PackageReference Include="Tomlyn" Version="0.17.0" />
     </ItemGroup>
 </Project>
diff --git a/M64RPFW.Services/M64RPFW.Services.csproj b/M64RPFW.Services/M64RPFW.Services.csproj
@@ -5,15 +5,15 @@
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AssemblyVersion>0.1.0</AssemblyVersion>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\M64RPFW.Models.Types\M64RPFW.Models.Types.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="SkiaSharp" Version="2.88.6" />
+      <PackageReference Include="SkiaSharp" Version="2.88.8" />
     </ItemGroup>
 
 </Project>
diff --git a/M64RPFW.ViewModels/M64RPFW.ViewModels.csproj b/M64RPFW.ViewModels/M64RPFW.ViewModels.csproj
@@ -5,14 +5,14 @@
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AssemblyVersion>0.1.0</AssemblyVersion>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-      <PackageReference Include="Silk.NET.SDL" Version="2.19.0" />
-      <PackageReference Include="SkiaSharp" Version="2.88.6" />
-      <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
+      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+      <PackageReference Include="Silk.NET.SDL" Version="2.21.0" />
+      <PackageReference Include="SkiaSharp" Version="2.88.8" />
+      <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/M64RPFW.Views.Avalonia/M64RPFW.Views.Avalonia.csproj b/M64RPFW.Views.Avalonia/M64RPFW.Views.Avalonia.csproj
@@ -1,41 +1,41 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <LangVersion>11</LangVersion>
+        <LangVersion>12</LangVersion>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
     </PropertyGroup>
 
     <ItemGroup>
-        <AvaloniaResource Include="Assets\**"/>
+        <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
 
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.5" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
-        <PackageReference Include="Avalonia.Svg" Version="11.0.0.6" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" />
+        <PackageReference Include="Avalonia" Version="11.1.4" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.4" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
+        <PackageReference Include="Avalonia.Svg" Version="11.1.0.1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.4" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.5" />
-        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.5" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="2.0.1"/>
-        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta">
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.4" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="11.1.4" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" />
+        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Silk.NET.OpenGL" Version="2.19.0" />
-        <PackageReference Include="Silk.NET.SDL" Version="2.19.0" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-        <PackageReference Include="System.Reactive" Version="6.0.0"/>
+        <PackageReference Include="Silk.NET.OpenGL" Version="2.21.0" />
+        <PackageReference Include="Silk.NET.SDL" Version="2.21.0" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+        <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\M64RPFW.ViewModels\M64RPFW.ViewModels.csproj"/>
+        <ProjectReference Include="..\M64RPFW.ViewModels\M64RPFW.ViewModels.csproj" />
     </ItemGroup>
 
 
@@ -72,13 +72,13 @@
 
 
     <ItemGroup>
-        <AdditionalFiles Include="Controls\FileBrowser.axaml"/>
-        <AdditionalFiles Include="Controls\HotkeyButton.axaml"/>
-        <AdditionalFiles Include="Views\Settings\EmulatorSettingsPage.axaml"/>
-        <AdditionalFiles Include="Views\Settings\GeneralSettingsPage.axaml"/>
-        <AdditionalFiles Include="Views\Settings\HotkeySettingsPage.axaml"/>
-        <AdditionalFiles Include="Views\Settings\PluginSettingsPage.axaml"/>
-        <AdditionalFiles Include="Views\Settings\VideoSettingsPage.axaml"/>
+        <AdditionalFiles Include="Controls\FileBrowser.axaml" />
+        <AdditionalFiles Include="Controls\HotkeyButton.axaml" />
+        <AdditionalFiles Include="Views\Settings\EmulatorSettingsPage.axaml" />
+        <AdditionalFiles Include="Views\Settings\GeneralSettingsPage.axaml" />
+        <AdditionalFiles Include="Views\Settings\HotkeySettingsPage.axaml" />
+        <AdditionalFiles Include="Views\Settings\PluginSettingsPage.axaml" />
+        <AdditionalFiles Include="Views\Settings\VideoSettingsPage.axaml" />
     </ItemGroup>
 
 
@@ -95,21 +95,21 @@
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>
         </EmbeddedResource>
-        <None Remove="Resources\Shaders\blit_quad.frag.glsl"/>
-        <None Remove="Resources\Shaders\blit_quad.vert.glsl"/>
+        <None Remove="Resources\Shaders\blit_quad.frag.glsl" />
+        <None Remove="Resources\Shaders\blit_quad.vert.glsl" />
     </ItemGroup>
 
 
     <ItemGroup>
-        <UpToDateCheckInput Remove="Assets\Shaders\blit_quad.frag.glsl"/>
-        <UpToDateCheckInput Remove="Assets\Shaders\blit_quad.vert.glsl"/>
+        <UpToDateCheckInput Remove="Assets\Shaders\blit_quad.frag.glsl" />
+        <UpToDateCheckInput Remove="Assets\Shaders\blit_quad.vert.glsl" />
 
 
     </ItemGroup>
 
 
     <ItemGroup>
-        <Folder Include="Controls\Helpers\Platform\"/>
+        <Folder Include="Controls\Helpers\Platform\" />
         <Folder Include="Extensions\" />
     </ItemGroup>
 
@@ -126,21 +126,21 @@
 
     <Target Name="CopyCustomLibraries" AfterTargets="AfterBuild">
         <ItemGroup>
-            <LibraryList Include="Libraries\$(OSLibraryDir)\*.*"/>
+            <LibraryList Include="Libraries\$(OSLibraryDir)\*.*" />
         </ItemGroup>
-        <Error Condition="!Exists('Libraries\$(OSLibraryDir)')" Text="No platform libraries found!"/>
-        <Message Text="Copying $(OSLibraryDir) libraries"/>
-        <Copy SourceFiles="@(LibraryList)" DestinationFolder="$(OutDir)Libraries" SkipUnchangedFiles="true"/>
+        <Error Condition="!Exists('Libraries\$(OSLibraryDir)')" Text="No platform libraries found!" />
+        <Message Text="Copying $(OSLibraryDir) libraries" />
+        <Copy SourceFiles="@(LibraryList)" DestinationFolder="$(OutDir)Libraries" SkipUnchangedFiles="true" />
         <!--make sure resulting TinCan.NET is executable-->
-        <Exec Condition="!$([MSBuild]::IsOSPlatform('Windows'))" Command="chmod +x &quot;$(OutDir)Libraries/TinCan.NET&quot;"/>
+        <Exec Condition="!$([MSBuild]::IsOSPlatform('Windows'))" Command="chmod +x &quot;$(OutDir)Libraries/TinCan.NET&quot;" />
     </Target>
 
     <Target Name="CopyCustomLibrariesPublish" AfterTargets="AfterPublish">
         <ItemGroup>
-            <LibraryList Include="Libraries\$(OSLibraryDir)\*.*"/>
+            <LibraryList Include="Libraries\$(OSLibraryDir)\*.*" />
         </ItemGroup>
-        <Error Condition="!Exists('Libraries\$(OSLibraryDir)')" Text="No platform libraries found!"/>
-        <Message Text="Copying $(OSLibraryDir) libraries"/>
-        <Copy SourceFiles="@(LibraryList)" DestinationFolder="$(PublishDir)/Libraries" SkipUnchangedFiles="true"/>
+        <Error Condition="!Exists('Libraries\$(OSLibraryDir)')" Text="No platform libraries found!" />
+        <Message Text="Copying $(OSLibraryDir) libraries" />
+        <Copy SourceFiles="@(LibraryList)" DestinationFolder="$(PublishDir)/Libraries" SkipUnchangedFiles="true" />
     </Target>
 </Project>