Sfoglia il codice sorgente

修改一波打包&工程配置

大爷 2 anni fa
parent
commit
b73c100f2b

+ 203 - 200
ET.sln

@@ -7,51 +7,54 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unity", "Unity", "{914C77C9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DotNet", "DotNet", "{46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{9498BFB4-D9F5-C441-13E3-3F26F7700E29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{52F66610-896A-C4D1-9881-1A19DF7AB80E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{1066F652-6A89-D1C4-9881-1A19DF7AB80E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{041131CD-3018-19B1-81B6-5DBEE2467FFB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{CD311104-1830-B119-81B6-5DBEE2467FFB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\Unity.HotfixView.csproj", "{DE4513D3-889B-5C52-8E9C-744C99AE7509}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\Unity.HotfixView.csproj", "{D31345DE-9B88-525C-8E9C-744C99AE7509}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView", "Unity\Unity.ModelView.csproj", "{C109842F-01DA-64D4-DBF2-00C6449E459E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView", "Unity\Unity.ModelView.csproj", "{2F8409C1-DA01-D464-DBF2-00C6449E459E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{E15BADD2-3A26-309A-AB0F-DC5B08044350}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core", "Unity\Unity.Core.csproj", "{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core", "Unity\Unity.Core.csproj", "{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.App", "DotNet\App\DotNet.App.csproj", "{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.App", "DotNet\App\DotNet.App.csproj", "{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Core", "DotNet\Core\DotNet.Core.csproj", "{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Core", "DotNet\Core\DotNet.Core.csproj", "{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Hotfix", "DotNet\Hotfix\DotNet.Hotfix.csproj", "{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Hotfix", "DotNet\Hotfix\DotNet.Hotfix.csproj", "{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Model", "DotNet\Model\DotNet.Model.csproj", "{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Model", "DotNet\Model\DotNet.Model.csproj", "{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{4B15C845-B5BD-4105-AE91-9B057F8AC134}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{4B15C845-B5BD-4105-AE91-9B057F8AC134}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Analyzer", "Share\Analyzer\Share.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Share.Analyzer", "Share\Analyzer\Share.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Tool", "Share\Tool\Share.Tool.csproj", "{1D028A2B-515C-49E2-923B-094CBD89BE5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Share.Tool", "Share\Tool\Share.Tool.csproj", "{1D028A2B-515C-49E2-923B-094CBD89BE5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model.Codes", "Unity\Unity.Model.Codes.csproj", "{F35320F7-9304-81E8-7D71-B379F8BA7E35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model.Codes", "Unity\Unity.Model.Codes.csproj", "{F72053F3-0493-E881-7D71-B379F8BA7E35}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix.Codes", "Unity\Unity.Hotfix.Codes.csproj", "{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix.Codes", "Unity\Unity.Hotfix.Codes.csproj", "{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView.Codes", "Unity\Unity.ModelView.Codes.csproj", "{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView.Codes", "Unity\Unity.ModelView.Codes.csproj", "{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView.Codes", "Unity\Unity.HotfixView.Codes.csproj", "{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView.Codes", "Unity\Unity.HotfixView.Codes.csproj", "{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8} = {986BB732-F4B8-64F8-D1F9-50CF255042D8}
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor.Codes", "Unity\Unity.Editor.Codes.csproj", "{89DD0821-4AE5-0EE7-65A0-445EF4C85913}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor.Codes", "Unity\Unity.Editor.Codes.csproj", "{2108DD89-E54A-E70E-65A0-445EF4C85913}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EnableCodes", "EnableCodes", "{13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader", "Unity\Unity.Loader.csproj", "{32B76B98-B8F4-F864-D1F9-50CF255042D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader", "Unity\Unity.Loader.csproj", "{986BB732-F4B8-64F8-D1F9-50CF255042D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Loader", "DotNet\Loader\DotNet.Loader.csproj", "{1D5E890A-C9D5-45DF-B098-73DBE39EB311}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Loader", "DotNet\Loader\DotNet.Loader.csproj", "{1D5E890A-C9D5-45DF-B098-73DBE39EB311}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,90 +66,92 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x64.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x86.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x64.ActiveCfg = Release|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x64.Build.0 = Release|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x86.ActiveCfg = Release|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x86.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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x64.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x86.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x64.ActiveCfg = Release|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x64.Build.0 = Release|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x86.ActiveCfg = Release|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x86.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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x64.Build.0 = Debug|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x86.Build.0 = Debug|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x64.ActiveCfg = Release|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x64.Build.0 = Release|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x86.ActiveCfg = Release|Any CPU
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x86.Build.0 = Release|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x64.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x64.ActiveCfg = Release|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x64.Build.0 = Release|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x86.Build.0 = Release|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x86.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
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.Build.0 = Release|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.Build.0 = Release|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x86.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
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.ActiveCfg = Release|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.Build.0 = Release|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.ActiveCfg = Release|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.Build.0 = Release|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.Build.0 = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Release|x64.Build.0 = Release|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29}.Release|x86.Build.0 = Release|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|x64.Build.0 = Debug|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|x86.Build.0 = Debug|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|x64.ActiveCfg = Release|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|x64.Build.0 = Release|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|x86.ActiveCfg = Release|Any CPU
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|x86.Build.0 = Release|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|x64.Build.0 = Debug|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|x86.Build.0 = Debug|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|x64.ActiveCfg = Release|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|x64.Build.0 = Release|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|x86.ActiveCfg = Release|Any CPU
+		{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|x86.Build.0 = Release|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Debug|x64.Build.0 = Debug|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Debug|x86.Build.0 = Debug|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Release|x64.ActiveCfg = Release|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Release|x64.Build.0 = Release|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Release|x86.ActiveCfg = Release|Any CPU
+		{D31345DE-9B88-525C-8E9C-744C99AE7509}.Release|x86.Build.0 = Release|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Release|x64.Build.0 = Release|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E}.Release|x86.Build.0 = Release|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|x64.Build.0 = Debug|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|x86.Build.0 = Debug|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|x64.ActiveCfg = Release|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|x64.Build.0 = Release|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|x86.ActiveCfg = Release|Any CPU
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|x86.Build.0 = Release|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Release|x64.ActiveCfg = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Release|x64.Build.0 = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Release|x86.ActiveCfg = Debug|Any CPU
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA}.Release|x86.Build.0 = Debug|Any CPU
+		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|x64.Build.0 = Debug|Any CPU
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -157,8 +162,8 @@ Global
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Release|x64.Build.0 = Release|Any CPU
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Release|x86.ActiveCfg = Release|Any CPU
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Release|x86.Build.0 = Release|Any CPU
-		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|x64.Build.0 = Debug|Any CPU
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -169,8 +174,8 @@ Global
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Release|x64.Build.0 = Release|Any CPU
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Release|x86.ActiveCfg = Release|Any CPU
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Release|x86.Build.0 = Release|Any CPU
-		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -181,8 +186,8 @@ Global
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Release|x64.Build.0 = Release|Any CPU
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Release|x86.ActiveCfg = Release|Any CPU
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Release|x86.Build.0 = Release|Any CPU
-		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|x64.Build.0 = Debug|Any CPU
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -193,8 +198,8 @@ Global
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Release|x64.Build.0 = Release|Any CPU
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Release|x86.ActiveCfg = Release|Any CPU
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Release|x86.Build.0 = Release|Any CPU
-		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -205,8 +210,6 @@ Global
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Release|x64.Build.0 = Release|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Release|x86.ActiveCfg = Release|Any CPU
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Release|x86.Build.0 = Release|Any CPU
-		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B15C845-B5BD-4105-AE91-9B057F8AC134}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -231,78 +234,78 @@ Global
 		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x64.Build.0 = Release|Any CPU
 		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x86.ActiveCfg = Release|Any CPU
 		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x86.Build.0 = Release|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Debug|x64.Build.0 = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Debug|x86.Build.0 = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Release|x64.ActiveCfg = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Release|x64.Build.0 = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Release|x86.ActiveCfg = Debug|Any CPU
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35}.Release|x86.Build.0 = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Debug|x86.Build.0 = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Release|x64.ActiveCfg = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Release|x64.Build.0 = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Release|x86.ActiveCfg = Debug|Any CPU
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D}.Release|x86.Build.0 = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Debug|x64.Build.0 = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Debug|x86.Build.0 = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Release|x64.ActiveCfg = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Release|x64.Build.0 = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Release|x86.ActiveCfg = Debug|Any CPU
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429}.Release|x86.Build.0 = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Debug|x64.Build.0 = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Debug|x86.Build.0 = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Release|x64.ActiveCfg = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Release|x64.Build.0 = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Release|x86.ActiveCfg = Debug|Any CPU
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C}.Release|x86.Build.0 = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Debug|x64.Build.0 = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Debug|x86.Build.0 = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|x64.ActiveCfg = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|x64.Build.0 = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|x86.ActiveCfg = Debug|Any CPU
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|x86.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x64.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x64.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x86.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x86.Build.0 = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Debug|x64.Build.0 = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Debug|x86.Build.0 = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Release|x64.ActiveCfg = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Release|x64.Build.0 = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Release|x86.ActiveCfg = Debug|Any CPU
+		{F72053F3-0493-E881-7D71-B379F8BA7E35}.Release|x86.Build.0 = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Debug|x64.Build.0 = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Debug|x86.Build.0 = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Release|x64.ActiveCfg = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Release|x64.Build.0 = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Release|x86.ActiveCfg = Debug|Any CPU
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D}.Release|x86.Build.0 = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Debug|x64.Build.0 = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Debug|x86.Build.0 = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Release|x64.ActiveCfg = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Release|x64.Build.0 = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Release|x86.ActiveCfg = Debug|Any CPU
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429}.Release|x86.Build.0 = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Debug|x64.Build.0 = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Debug|x86.Build.0 = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Release|x64.ActiveCfg = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Release|x64.Build.0 = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Release|x86.ActiveCfg = Debug|Any CPU
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C}.Release|x86.Build.0 = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Debug|x64.Build.0 = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Debug|x86.Build.0 = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Release|x64.ActiveCfg = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Release|x64.Build.0 = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Release|x86.ActiveCfg = Debug|Any CPU
+		{2108DD89-E54A-E70E-65A0-445EF4C85913}.Release|x86.Build.0 = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Release|x64.ActiveCfg = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Release|x64.Build.0 = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Release|x86.ActiveCfg = Debug|Any CPU
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8}.Release|x86.Build.0 = Debug|Any CPU
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -320,9 +323,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{041131CD-3018-19B1-81B6-5DBEE2467FFB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{B4BF9894-F5D9-41C4-13E3-3F26F7700E29} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{1066F652-6A89-D1C4-9881-1A19DF7AB80E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{CD311104-1830-B119-81B6-5DBEE2467FFB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{D31345DE-9B88-525C-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{2F8409C1-DA01-D464-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{E15BADD2-3A26-309A-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{EB9B0E77-13B3-6137-FAA2-76DAF4B34ADA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{20CA1FD3-A23B-4F12-ADA5-C3B759814F9D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{1059524B-9F01-4C3E-8A7C-6BBDD1D174C7} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
@@ -330,18 +337,14 @@ Global
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{1D028A2B-515C-49E2-923B-094CBD89BE5A} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
+		{F72053F3-0493-E881-7D71-B379F8BA7E35} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
+		{3CDCD0D2-1484-B5F3-7B89-AEA449F00E4D} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
+		{2FCC0DE8-0542-95C8-4E78-6ED5FE5CD429} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
+		{C6BE58AB-176A-DCB4-A2EC-30AE7CA7216C} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
+		{2108DD89-E54A-E70E-65A0-445EF4C85913} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
 		{13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{89DD0821-4AE5-0EE7-65A0-445EF4C85913} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
-		{D2D0DC3C-8414-F3B5-7B89-AEA449F00E4D} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
-		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
-		{F35320F7-9304-81E8-7D71-B379F8BA7E35} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
-		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{986BB732-F4B8-64F8-D1F9-50CF255042D8} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 1 - 1
Unity/Assets/Res/Config/HotUpdateAssemblyManifest.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f9ce34f47e4ed4827c54fe59e948d5, type: 3}
-  m_Name: HotUpdateAssemblyManifest
+  m_Name: Assets/Res/Config/HotUpdateAssemblyManifest.asset
   m_EditorClassIdentifier: 
   AOTMetadataDlls:
   - System.dll

+ 1 - 1
Unity/Assets/Scripts/Codes/Model/Share/Module/Numeric/NumericComponent.cs

@@ -103,7 +103,7 @@ namespace ET
     [ComponentOf(typeof (Unit))]
     public class NumericComponent: Entity, IAwake, ITransfer
     {
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
+        //[BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
         public Dictionary<int, long> NumericDic = new Dictionary<int, long>();
 
         public long this[int numericType]

+ 1 - 0
Unity/Assets/Scripts/Core/Serialize/MongoHelper.cs

@@ -106,6 +106,7 @@ namespace ET
                     continue;
                 }
 
+                Log.Debug($"LookupClassMap: {type.Name}");
                 BsonClassMap.LookupClassMap(type);
             }
         }

+ 1 - 2
Unity/Assets/Scripts/Editor/BuildEditor/BuildHelper.cs

@@ -199,8 +199,7 @@ namespace ET
             }
 
             var builder = new AssetBundleBuilder();
-            bool succeed = builder.Run(buildParameters);
-            if (succeed)
+            if (builder.Run(buildParameters).Success)
             {
                 EditorUtility.RevealInFinder($"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.BuildVersion}");
             }

+ 1 - 6
Unity/Assets/Scripts/Loader/CodeLoader.cs

@@ -102,13 +102,8 @@ namespace ET
             foreach (var task in rawFileOperations)
             {
                 var ret = RuntimeApi.LoadMetadataForAOTAssembly(task.GetRawBytes(), HomologousImageMode.SuperSet);
-                if (ret == LoadImageErrorCode.OK)
                 {
-                    Log.Debug($"LoadMetadataForAOTAssembly({task.GetBundleName()}) ok.");
-                }
-                else
-                {
-                    Log.Error($"LoadMetadataForAOTAssembly({task.GetBundleName()}) Error: {ret}");
+                    Log.Error($"Error occurs when loadMetadataForAOT: {ret}");
                 }
             }
         }

+ 23 - 0
Unity/Packages/packages-lock.json

@@ -1,11 +1,34 @@
 {
   "dependencies": {
+    "com.cysharp.unitask": {
+      "version": "file:UniTask",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.focus-creative-games.hybridclr_unity": {
       "version": "file:com.focus-creative-games.hybridclr_unity",
       "depth": 0,
       "source": "embedded",
       "dependencies": {}
     },
+    "com.nkg.fgui": {
+      "version": "file:FairyGUI",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "com.tuyoogame.yooasset": {
+      "version": "file:YooAsset",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.unity.scriptablebuildpipeline": "1.20.2",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
+      }
+    },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,

+ 3 - 3
Unity/ProjectSettings/HybridCLRSettings.asset

@@ -26,8 +26,8 @@ MonoBehaviour:
   - Temp/Bin/Debug
   strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip
   patchAOTAssemblies: []
-  collectAssetReferenceTypes: 0
+  collectAssetReferenceTypes: 1
   outputLinkFile: HybridCLRData/Generated/link.xml
   outputAOTGenericReferenceFile: HybridCLRData/Generated/AOTGenericReferences.cs
-  maxGenericReferenceIteration: 10
-  maxMethodBridgeGenericIteration: 10
+  maxGenericReferenceIteration: 30
+  maxMethodBridgeGenericIteration: 30