更新到dotnet 6.0

Robot/App/Robot.App.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>ET</RootNamespace>
         <AssemblyName>Robot</AssemblyName>
     </PropertyGroup>

Robot/Hotfix/Robot.Hotfix.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>ET</RootNamespace>
     </PropertyGroup>
 

Robot/Model/Robot.Model.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>ET</RootNamespace>
     </PropertyGroup>
 

Server/App/Server.App.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ET</RootNamespace>
     <LangVersion>8</LangVersion>
     <AssemblyName>Server</AssemblyName>

Server/Hotfix/Server.Hotfix.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ET</RootNamespace>
     <LangVersion>8</LangVersion>
   </PropertyGroup>

Server/Model/Server.Model.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ET</RootNamespace>
     <LangVersion>8</LangVersion>
   </PropertyGroup>

ThirdParty/ShareLib/ShareLib.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

ThirdParty/UnityEngine/UnityEngine.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>8</LangVersion>
     </PropertyGroup>
 

ThirdParty/protobuf-net/protobuf-net.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>protobuf_net</RootNamespace>
     </PropertyGroup>
 

Unity/Assets/Bundles/Lua/CSharpLua/CoreSystem/Collections/PriorityQueue.lua.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 74e3cdc87876e42d5b802600d678922c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Lua/CSharpLua/CoreSystem/Collections/SortedList.lua.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4a61393c8a1234a629ae15ff391f9aca
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Lua/CSharpLua/CoreSystem/Threading/Task.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e7d9d3b92e75d47fa95cc9f1c8f05d92
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Lua/CSharpLua/CoreSystem/Threading/Thread.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 06358ff56f0874c3d806c5ab6657b15c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Lua/CSharpLua/CoreSystem/Threading/Timer.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f8297abb68dd34861bc02aace6809a65
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Lua/CSharpLua/Sample.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c2ce987b429241dda64cb704f8c7993
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Lua/CSharpLua/Sample/test.lua.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1d8be2d0976aa4826a346ac951e8ed03
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Mono/Core/Helper/MD5Helper.cs

@@ -9,8 +9,8 @@ namespace ET
 		{
 			byte[] retVal;
             using (FileStream file = new FileStream(filePath, FileMode.Open))
-			{
-				MD5 md5 = new MD5CryptoServiceProvider();
+            {
+	            MD5 md5 = MD5.Create();
 				retVal = md5.ComputeHash(file);
 			}
 			return retVal.ToHex("x2");

Unity/Packages/packages-lock.json

@@ -55,15 +55,6 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.textmeshpro": {
-      "version": "3.0.6",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.timeline": {
       "version": "1.4.8",
       "depth": 0,

Unity/Unity.Mono.csproj

@@ -52,35 +52,71 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
+     <Compile Include="Assets\Mono\XLua\Src\ObjectTranslatorPool.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaTable.cs" />
+     <Compile Include="Assets\Mono\XLua\util\Xxtea.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaDLL.cs" />
      <Compile Include="Assets\Mono\Core\Helper\NetworkHelper.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\Init.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\Utils.cs" />
      <Compile Include="Assets\Mono\Core\Async\ETCancellationToken.cs" />
      <Compile Include="Assets\Mono\Core\Helper\ProcessHelper.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\ReferenceCollector.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\RawObject.cs" />
      <Compile Include="Assets\Mono\Core\Helper\EnumHelper.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\TemplateEngine\TemplateEngine.cs" />
      <Compile Include="Assets\Mono\Core\Async\ETTask.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\MethodWarpsCache.cs" />
+     <Compile Include="Assets\Mono\Interpreter\Interpreter.cs" />
      <Compile Include="Assets\Mono\Core\Helper\FileHelper.cs" />
      <Compile Include="Assets\Mono\Core\ThreadSynchronizationContext.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\ObjectPool.cs" />
      <Compile Include="Assets\Mono\Core\Async\AsyncETVoidMethodBuilder.cs" />
      <Compile Include="Assets\Mono\Core\Async\AsyncMethodBuilderAttribute.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaBase.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\UILayerScript.cs" />
      <Compile Include="Assets\Mono\Core\Helper\ByteHelper.cs" />
      <Compile Include="Assets\Mono\Core\Async\IAwaiter.cs" />
+     <Compile Include="Assets\Mono\XLua\LuaEntry.cs" />
+     <Compile Include="Assets\Mono\XLua\LuaLoader.cs" />
      <Compile Include="Assets\Mono\Core\Helper\JsonHelper.cs" />
      <Compile Include="Assets\Mono\Core\Helper\RandomHelper.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\GenAttributes.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\GizmosDebug.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaFunction.cs" />
      <Compile Include="Assets\Mono\Core\Async\AsyncETTaskCompletedMethodBuilder.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\ObjectCasters.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\SignatureLoader.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\TypeExtensions.cs" />
      <Compile Include="Assets\Mono\Core\Helper\ZipHelper.cs" />
+     <Compile Include="Assets\Mono\Helper\PathHelper.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\ObjectTranslator.cs" />
      <Compile Include="Assets\Mono\Core\Async\AsyncETTaskMethodBuilder.cs" />
      <Compile Include="Assets\Mono\Core\Helper\MD5Helper.cs" />
      <Compile Include="Assets\Mono\Core\Helper\ObjectHelper.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaEnv.cs" />
      <Compile Include="Assets\Mono\Core\Async\ETVoid.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\CodeEmit.cs" />
      <Compile Include="Assets\Mono\Core\Async\ETTaskCompleted.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaException.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\DelegateBridge.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\GenericDelegateBridge.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\ComponentView.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\CanvasConfig.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\CopyByValue.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\LuaAsset.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\StaticLuaCallbacks.cs" />
+     <Compile Include="Assets\Mono\Helper\StreamHelper.cs" />
+     <Compile Include="Assets\Mono\XLua\Src\InternalGlobals.cs" />
+     <Compile Include="Assets\Mono\Helper\LoadHelper.cs" />
      <Compile Include="Assets\Mono\Core\Helper\StringHelper.cs" />
      <Compile Include="Assets\Mono\Core\Async\ETTaskHelper.cs" />
+     <Compile Include="Assets\Mono\Define.cs" />
+     <None Include="Assets\Mono\XLua\Resources\xlua\util.lua.txt" />
+     <None Include="Assets\Mono\XLua\Resources\perf\profiler.lua.txt" />
+     <None Include="Assets\Mono\XLua\Resources\perf\memory.lua.txt" />
      <None Include="Assets\Mono\Unity.Mono.asmdef" />
+     <None Include="Assets\Mono\XLua\Resources\tdr\tdr.lua.txt" />
  <Reference Include="UnityEngine">
  <HintPath>/Applications/Unity/Hub/Editor/2020.3.18f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>
  </Reference>

Unity/Unity.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity.ThirdParty.csproj", "{d2ad5be1-263a-9a30-ab0f-dc5b08044350}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mono", "Unity.Mono.csproj", "{5910fa29-5797-199c-985b-fc9fc473328e}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity.Hotfix.csproj", "{52f66610-896a-c4d1-9881-1a19df7ab80e}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity.HotfixView.csproj", "{de4513d3-889b-5c52-8e9c-744c99ae7509}"
@@ -11,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity.Model.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView", "Unity.ModelView.csproj", "{c109842f-01da-64d4-dbf2-00c6449e459e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mono", "Unity.Mono.csproj", "{5910fa29-5797-199c-985b-fc9fc473328e}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity.Editor.csproj", "{041131cd-3018-19b1-81b6-5dbee2467ffb}"
 EndProject
 Global
@@ -25,6 +25,10 @@ Global
 		{d2ad5be1-263a-9a30-ab0f-dc5b08044350}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{d2ad5be1-263a-9a30-ab0f-dc5b08044350}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{d2ad5be1-263a-9a30-ab0f-dc5b08044350}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5910fa29-5797-199c-985b-fc9fc473328e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5910fa29-5797-199c-985b-fc9fc473328e}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5910fa29-5797-199c-985b-fc9fc473328e}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5910fa29-5797-199c-985b-fc9fc473328e}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52f66610-896a-c4d1-9881-1a19df7ab80e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52f66610-896a-c4d1-9881-1a19df7ab80e}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52f66610-896a-c4d1-9881-1a19df7ab80e}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -41,10 +45,6 @@ Global
 		{c109842f-01da-64d4-dbf2-00c6449e459e}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{c109842f-01da-64d4-dbf2-00c6449e459e}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{c109842f-01da-64d4-dbf2-00c6449e459e}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5910fa29-5797-199c-985b-fc9fc473328e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5910fa29-5797-199c-985b-fc9fc473328e}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5910fa29-5797-199c-985b-fc9fc473328e}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5910fa29-5797-199c-985b-fc9fc473328e}.Release|Any CPU.Build.0 = Release|Any CPU
 		{041131cd-3018-19b1-81b6-5dbee2467ffb}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{041131cd-3018-19b1-81b6-5dbee2467ffb}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{041131cd-3018-19b1-81b6-5dbee2467ffb}.Release|Any CPU.ActiveCfg = Release|Any CPU