Merge pull request #707 from Cysharp/feature/ReorganizeDependency

Reorganize internal shared code dependency
Cysharp · Oct 30, 2023 · 4c72b41 · 4c72b41
2 parents 9d946e0 + e41c70b
commit 4c72b41
Show file tree

Hide file tree

Showing 216 changed files with 2,520 additions and 2,190 deletions.
diff --git a/MagicOnion.Packaging.slnf b/MagicOnion.Packaging.slnf
@@ -4,6 +4,7 @@
     "projects": [
       "src\\MagicOnion.Abstractions\\MagicOnion.Abstractions.csproj",
       "src\\MagicOnion.Client\\MagicOnion.Client.csproj",
+      "src\\MagicOnion.Serialization.MessagePack\\MagicOnion.Serialization.MessagePack.csproj",
       "src\\MagicOnion.Serialization.MemoryPack\\MagicOnion.Serialization.MemoryPack.csproj",
       "src\\MagicOnion.Server.HttpGateway\\MagicOnion.Server.HttpGateway.csproj",
       "src\\MagicOnion.Server.Redis\\MagicOnion.Server.Redis.csproj",

diff --git a/MagicOnion.sln b/MagicOnion.sln
@@ -73,8 +73,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicServerSample", "tests\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Client.Tests", "tests\MagicOnion.Client.Tests\MagicOnion.Client.Tests.csproj", "{6DF31417-D091-4E27-963F-75E1D5AC0EA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Shared.Tests", "tests\MagicOnion.Shared.Tests\MagicOnion.Shared.Tests.csproj", "{A6DB6E90-711E-4832-B8F0-BEB14E31B77C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Integration.Tests", "tests\MagicOnion.Integration.Tests\MagicOnion.Integration.Tests.csproj", "{EC4E0789-6A32-42FA-ABD7-7ED3A5004CFF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnionTestServer", "tests\samples\MagicOnionTestServer\MagicOnionTestServer.csproj", "{D0555A91-D817-4322-B8D0-16641069D17B}"
@@ -111,6 +109,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SourceGeneratorPerf", "Sour
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorPerf", "perf\SourceGeneratorPerf\SourceGeneratorPerf\SourceGeneratorPerf.csproj", "{7F132098-0C1D-4F3A-B049-ACABF5E35973}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Serialization.MessagePack", "src\MagicOnion.Serialization.MessagePack\MagicOnion.Serialization.MessagePack.csproj", "{6C34E9BF-4E05-4A73-B439-75F3369B88A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Internal", "src\MagicOnion.Internal\MagicOnion.Internal.csproj", "{2996029B-D329-499F-8525-69614A820135}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.Serialization.MessagePack.Tests", "tests\MagicOnion.Serialization.MessagePack.Tests\MagicOnion.Serialization.MessagePack.Tests.csproj", "{701E193F-587D-4C20-8970-6E215B0634F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Abstractions.Tests", "tests\MagicOnion.Abstractions.Tests\MagicOnion.Abstractions.Tests.csproj", "{D340EFB8-128A-4B49-A47A-F00A905D10AC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -181,10 +187,6 @@ Global
 		{6DF31417-D091-4E27-963F-75E1D5AC0EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6DF31417-D091-4E27-963F-75E1D5AC0EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6DF31417-D091-4E27-963F-75E1D5AC0EA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6DB6E90-711E-4832-B8F0-BEB14E31B77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6DB6E90-711E-4832-B8F0-BEB14E31B77C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6DB6E90-711E-4832-B8F0-BEB14E31B77C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6DB6E90-711E-4832-B8F0-BEB14E31B77C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC4E0789-6A32-42FA-ABD7-7ED3A5004CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC4E0789-6A32-42FA-ABD7-7ED3A5004CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC4E0789-6A32-42FA-ABD7-7ED3A5004CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -245,6 +247,22 @@ Global
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C34E9BF-4E05-4A73-B439-75F3369B88A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C34E9BF-4E05-4A73-B439-75F3369B88A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C34E9BF-4E05-4A73-B439-75F3369B88A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C34E9BF-4E05-4A73-B439-75F3369B88A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2996029B-D329-499F-8525-69614A820135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2996029B-D329-499F-8525-69614A820135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2996029B-D329-499F-8525-69614A820135}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2996029B-D329-499F-8525-69614A820135}.Release|Any CPU.Build.0 = Release|Any CPU
+		{701E193F-587D-4C20-8970-6E215B0634F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{701E193F-587D-4C20-8970-6E215B0634F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{701E193F-587D-4C20-8970-6E215B0634F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{701E193F-587D-4C20-8970-6E215B0634F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D340EFB8-128A-4B49-A47A-F00A905D10AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D340EFB8-128A-4B49-A47A-F00A905D10AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D340EFB8-128A-4B49-A47A-F00A905D10AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D340EFB8-128A-4B49-A47A-F00A905D10AC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -270,7 +288,6 @@ Global
 		{4D5E8486-9A0D-444A-922B-1D94FD8A820A} = {B5617CC1-55FD-4F77-BA75-9450474C6527}
 		{BC29EA94-6C52-4FAA-8F26-9346DB85C58F} = {B5617CC1-55FD-4F77-BA75-9450474C6527}
 		{6DF31417-D091-4E27-963F-75E1D5AC0EA0} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
-		{A6DB6E90-711E-4832-B8F0-BEB14E31B77C} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{EC4E0789-6A32-42FA-ABD7-7ED3A5004CFF} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{D0555A91-D817-4322-B8D0-16641069D17B} = {B5617CC1-55FD-4F77-BA75-9450474C6527}
 		{2FF12B46-BA5C-4B6C-BD94-3556C3F25722} = {A0CED9FB-5B18-4EE3-859F-CE3A6F90A82A}
@@ -288,6 +305,10 @@ Global
 		{AFB26C11-0833-459D-B071-7CA001BD7F01} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{E9E11DFE-29C4-4933-A21B-2222646D946E} = {A0CED9FB-5B18-4EE3-859F-CE3A6F90A82A}
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973} = {E9E11DFE-29C4-4933-A21B-2222646D946E}
+		{6C34E9BF-4E05-4A73-B439-75F3369B88A8} = {1987061F-8970-4018-8D58-6932961C9EB4}
+		{2996029B-D329-499F-8525-69614A820135} = {1987061F-8970-4018-8D58-6932961C9EB4}
+		{701E193F-587D-4C20-8970-6E215B0634F8} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
+		{D340EFB8-128A-4B49-A47A-F00A905D10AC} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D5B2E7E3-B727-40A1-BE68-7BAC9B9DE2FE}

diff --git a/perf/BenchmarkApp/PerformanceTest.Client/Program.cs b/perf/BenchmarkApp/PerformanceTest.Client/Program.cs
@@ -5,6 +5,7 @@
 using MagicOnion.Client;
 using MagicOnion.Serialization;
 using MagicOnion.Serialization.MemoryPack;
+using MagicOnion.Serialization.MessagePack;
 using PerformanceTest.Shared;
 
 var app = ConsoleApp.Create(args);

diff --git a/perf/SourceGeneratorPerf/SourceGeneratorPerf/CompilationHelper.cs b/perf/SourceGeneratorPerf/SourceGeneratorPerf/CompilationHelper.cs
@@ -27,7 +27,7 @@ public static (Compilation Compilation, SemanticModel SemanticModel) Create(stri
             MetadataReference.CreateFromFile(typeof(MessagePack.MessagePackObjectAttribute).Assembly.Location), // MessagePack.Annotations
             MetadataReference.CreateFromFile(typeof(MagicOnion.IService<>).Assembly.Location), // MagicOnion.Abstractions
             MetadataReference.CreateFromFile(typeof(MagicOnion.Client.MagicOnionClient).Assembly.Location), // MagicOnion.Client
-            MetadataReference.CreateFromFile(typeof(MagicOnion.Internal.GrpcMethodHelper).Assembly.Location), // MagicOnion.Shared
+            MetadataReference.CreateFromFile(typeof(MagicOnion.Serialization.MagicOnionSerializerProvider).Assembly.Location), // MagicOnion.Shared
         };
         var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);