升级.netFramework从4.5.2到4.8

.gitignore

@@ -4,3 +4,4 @@
 *.pdb
 Assets/Plugins/**
 Common/Assets/Plugins/**
+Debug

Common/CommonAI/CommonAI_C.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommonAI</RootNamespace>
     <AssemblyName>CommonAI</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

Common/CommonLang/CommonLang_C.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommonLang</RootNamespace>
     <AssemblyName>CommonLang</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

Common/Pomelo/PomeloShare/PomeloShare.csproj

@@ -25,7 +25,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Pomelo</RootNamespace>
     <AssemblyName>PomeloShare</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

ResBuilder/bin/Debug/ResBuilder.exe.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>

XmdsCommon.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31911.196
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmdsCommon", "XmdsCommon\XmdsCommon.csproj", "{E739A788-7A95-4427-BB97-A167960DB7DB}"
 EndProject
@@ -27,11 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonUI", "Common\CommonUI
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonUI_Unity3D", "Common\CommonUI_Unity3D\CommonUI_Unity3D.csproj", "{3054CED6-DF3B-4DDF-BEAD-03FCBA15F6F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmdsFileUpdate", "XmdsFileUpdate\XmdsFileUpdate.csproj", "{6D970EB4-09CD-43A2-9E3F-4944D54E1541}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ABAEF73B-57E3-417D-8A07-7248949B7ADD} = {ABAEF73B-57E3-417D-8A07-7248949B7ADD}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMPQ", "Common\CommonFileSystem\CommonMPQ.csproj", "{E6F4820C-30D4-4DDF-8890-517C9EFD92A8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmdsBattleClient", "XmdsBattleClient\XmdsBattleClient.csproj", "{046B6C3A-4D94-4B40-BF11-D43FCE2050C7}"
@@ -619,62 +614,6 @@ Global
 		{3054CED6-DF3B-4DDF-BEAD-03FCBA15F6F0}.Unity|Mixed Platforms.Build.0 = Release|Any CPU
 		{3054CED6-DF3B-4DDF-BEAD-03FCBA15F6F0}.Unity|x86.ActiveCfg = Release|Any CPU
 		{3054CED6-DF3B-4DDF-BEAD-03FCBA15F6F0}.Unity|x86.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.CoreOnly|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.CoreOnly|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.CoreOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.CoreOnly|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.CoreOnly|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.CoreOnly|x86.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug_JSGProfile|Any CPU.ActiveCfg = Debug_JSGProfile|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug_JSGProfile|Any CPU.Build.0 = Debug_JSGProfile|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug_JSGProfile|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug_JSGProfile|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug_JSGProfile|x86.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.iOS|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.iOS|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.iOS|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.iOS|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.iOS|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.iOS|x86.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.JSGClient|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.JSGClient|Any CPU.Build.0 = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.JSGClient|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.JSGClient|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.JSGClient|x86.ActiveCfg = Debug|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Net20|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Net20|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Net20|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Net20|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Net20|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Net20|x86.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Profile|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Profile|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Profile|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Profile|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Profile|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Profile|x86.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Release|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Silverlight2|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Silverlight2|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Silverlight2|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Silverlight2|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Silverlight2|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Silverlight2|x86.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Unity|Any CPU.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Unity|Any CPU.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Unity|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Unity|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Unity|x86.ActiveCfg = Release|Any CPU
-		{6D970EB4-09CD-43A2-9E3F-4944D54E1541}.Unity|x86.Build.0 = Release|Any CPU
 		{E6F4820C-30D4-4DDF-8890-517C9EFD92A8}.CoreOnly|Any CPU.ActiveCfg = Release|Any CPU
 		{E6F4820C-30D4-4DDF-8890-517C9EFD92A8}.CoreOnly|Any CPU.Build.0 = Release|Any CPU
 		{E6F4820C-30D4-4DDF-8890-517C9EFD92A8}.CoreOnly|Mixed Platforms.ActiveCfg = Release|Any CPU

XmdsCommon/XmdsCommon_C.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XmdsCommon</RootNamespace>
     <AssemblyName>XmdsCommon</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>

XmdsServerCS/XmdsServerEdgeJS/XmdsServerEdgeJS.csproj

@@ -19,7 +19,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XmdsServerEdgeJS</RootNamespace>
     <AssemblyName>XmdsServerEdgeJS</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

XmdsServerCS/XmdsServerNode/XmdsServerNode.csproj

@@ -21,7 +21,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XmdsServerNode</RootNamespace>
     <AssemblyName>XmdsServerNode</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>