From 4bdd095ba6aaf0b8cabf4b24d16d12dee41608a9 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Sat, 25 Nov 2023 01:52:13 +0800
Subject: [PATCH] .NET 8

---
 FunGame.Desktop/FunGame.Desktop.csproj     | 5 ++---
 FunGame.Desktop/UI/Main/Main.cs            | 2 +-
 FunGame.Implement/FunGame.Implement.csproj | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/FunGame.Desktop/FunGame.Desktop.csproj b/FunGame.Desktop/FunGame.Desktop.csproj
index 4537ec6..ddd22ab 100644
--- a/FunGame.Desktop/FunGame.Desktop.csproj
+++ b/FunGame.Desktop/FunGame.Desktop.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -40,8 +40,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame.Core\bin\Debug\net7.0\FunGame.Core.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs
index fa0737b..b21bcc4 100644
--- a/FunGame.Desktop/UI/Main/Main.cs
+++ b/FunGame.Desktop/UI/Main/Main.cs
@@ -1279,7 +1279,7 @@ namespace Milimoe.FunGame.Desktop.UI
         private void PresetText_SelectedIndexChanged(object sender, EventArgs e)
         {
             // 发送快捷消息并执行功能
-            if (PresetText.SelectedIndex != 0)
+            if (PresetText.SelectedIndex != 0 && PresetText.SelectedItem != null)
             {
                 string s = PresetText.SelectedItem.ToString() ?? "";
                 SendTalkText_Click(s);
diff --git a/FunGame.Implement/FunGame.Implement.csproj b/FunGame.Implement/FunGame.Implement.csproj
index 057057e..b57b6cb 100644
--- a/FunGame.Implement/FunGame.Implement.csproj
+++ b/FunGame.Implement/FunGame.Implement.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Company>Milimoe</Company>
@@ -25,8 +25,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame.Core\bin\Debug\net7.0\FunGame.Core.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
     </Reference>
   </ItemGroup>