From d99a643be2f3d4770e9fc0200c22d916bc91ab1d Mon Sep 17 00:00:00 2001
From: Mili <mili@mili.cyou>
Date: Fri, 31 Mar 2023 21:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FunGame.Implement/FunGame.Implement.csproj |  7 +++----
 FunGame.Server/FunGame.Server.csproj       | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/FunGame.Implement/FunGame.Implement.csproj b/FunGame.Implement/FunGame.Implement.csproj
index 750672d..03273d4 100644
--- a/FunGame.Implement/FunGame.Implement.csproj
+++ b/FunGame.Implement/FunGame.Implement.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <BaseOutputPath>C:\milimoe\FunGame\bin\Server</BaseOutputPath>
+    <BaseOutputPath>..\bin</BaseOutputPath>
     <Title>FunGameServer</Title>
     <Authors>Milimoe</Authors>
     <Product>$(AssemblyName)</Product>
@@ -12,7 +12,7 @@
     <PackageOutputPath>C:\milimoe\FunGame\bin</PackageOutputPath>
     <AssemblyVersion>1.0</AssemblyVersion>
     <FileVersion>1.0</FileVersion>
-    <RootNamespace>Milimoe.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
+    <RootNamespace>Milimoe.FunGame.Core.Implement</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -25,8 +25,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame\bin\Debug\net7.0\FunGame.Core.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\FunGame.Core\bin\Debug\net7.0\FunGame.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/FunGame.Server/FunGame.Server.csproj b/FunGame.Server/FunGame.Server.csproj
index d41ed1b..72af177 100644
--- a/FunGame.Server/FunGame.Server.csproj
+++ b/FunGame.Server/FunGame.Server.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <PackageIcon>logo.ico</PackageIcon>
-    <BaseOutputPath>C:\milimoe\FunGame\bin\Server</BaseOutputPath>
+    <BaseOutputPath>..\bin</BaseOutputPath>
     <Title>FunGameServer</Title>
     <Company>Milimoe</Company>
     <Authors>Milimoe</Authors>
@@ -30,26 +30,25 @@
     <Content Include="logo.ico" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\FunGame.Implement\FunGame.Implement.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame\bin\Debug\net7.0-windows\FunGame.Core.dll</HintPath>
-		<Private>True</Private>
+      <HintPath>..\..\FunGame.Core\bin\Debug\net7.0\FunGame.Core.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data">
-      <HintPath>..\..\FunGame\bin\Server\Debug\net7.0\MySql.Data.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <HintPath>..\bin\Debug\net7.0\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\FunGame\bin\Debug\net7.0-windows\Newtonsoft.Json.dll</HintPath>
-		<Private>True</Private>
+      <HintPath>..\bin\Debug\net7.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration.ConfigurationManager">
-      <HintPath>..\..\FunGame\bin\Server\Debug\net7.0\System.Configuration.ConfigurationManager.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <HintPath>..\bin\Debug\net7.0\System.Configuration.ConfigurationManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Permissions">
-      <HintPath>..\..\FunGame\bin\Server\Debug\net7.0\System.Security.Permissions.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <HintPath>..\bin\Debug\net7.0\System.Security.Permissions.dll</HintPath>
     </Reference>
   </ItemGroup>