2.0.5, renew unit tests.

Cysharp · Feb 28, 2019 · 975838b · 975838b
1 parent 8c42f75
commit 975838b
Show file tree

Hide file tree

Showing 28 changed files with 1,869 additions and 222 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <LangVersion>7.3</LangVersion>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
+</Project>
diff --git a/MagicOnion.sln b/MagicOnion.sln
@@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7ACC27E8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandbox", "sandbox", "{7682EFFC-681C-4DCC-B5E7-D8449E42DAC9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.Tests", "tests\MagicOnion.Tests\MagicOnion.Tests.csproj", "{879C8453-8995-4D9A-964F-2FEA2B84FF1A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion", "src\MagicOnion\MagicOnion.csproj", "{C79CE0BF-ED4C-47BE-822E-E82CF83FC68A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{7F61607D-5772-4E41-9D37-04E6AE7E47BA}"
@@ -25,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{7F61607D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.HttpGateway", "src\MagicOnion.HttpGateway\MagicOnion.HttpGateway.csproj", "{FCE03661-803E-4629-944F-45DB6B444320}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Tests.NetCore", "tests\MagicOnion.Tests.NetCore\MagicOnion.Tests.NetCore.csproj", "{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox.NetCoreServer", "sandbox\Sandbox.NetCoreServer\Sandbox.NetCoreServer.csproj", "{8174DFB5-0C46-440C-A225-C3A9851C2700}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicCodeDumper", "sandbox\DynamicCodeDumper\DynamicCodeDumper.csproj", "{A2156D81-1A67-4EAC-8A74-3E459385E4A0}"
@@ -43,16 +39,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Hosting", "src\M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Hosting.Tests", "tests\MagicOnion.Hosting.Tests\MagicOnion.Hosting.Tests.csproj", "{5A381446-409B-4532-8B1A-877D996F7575}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.NetCoreTests", "tests\MagicOnion.NetCoreTests\MagicOnion.NetCoreTests.csproj", "{9130778E-4B00-436C-BD1F-1DFDF95AD2CC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{879C8453-8995-4D9A-964F-2FEA2B84FF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{879C8453-8995-4D9A-964F-2FEA2B84FF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{879C8453-8995-4D9A-964F-2FEA2B84FF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{879C8453-8995-4D9A-964F-2FEA2B84FF1A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C79CE0BF-ED4C-47BE-822E-E82CF83FC68A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C79CE0BF-ED4C-47BE-822E-E82CF83FC68A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C79CE0BF-ED4C-47BE-822E-E82CF83FC68A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,10 +55,6 @@ Global
 		{FCE03661-803E-4629-944F-45DB6B444320}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCE03661-803E-4629-944F-45DB6B444320}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCE03661-803E-4629-944F-45DB6B444320}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8174DFB5-0C46-440C-A225-C3A9851C2700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8174DFB5-0C46-440C-A225-C3A9851C2700}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8174DFB5-0C46-440C-A225-C3A9851C2700}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,22 +83,25 @@ Global
 		{5A381446-409B-4532-8B1A-877D996F7575}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A381446-409B-4532-8B1A-877D996F7575}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A381446-409B-4532-8B1A-877D996F7575}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9130778E-4B00-436C-BD1F-1DFDF95AD2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9130778E-4B00-436C-BD1F-1DFDF95AD2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9130778E-4B00-436C-BD1F-1DFDF95AD2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9130778E-4B00-436C-BD1F-1DFDF95AD2CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{879C8453-8995-4D9A-964F-2FEA2B84FF1A} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{C79CE0BF-ED4C-47BE-822E-E82CF83FC68A} = {1987061F-8970-4018-8D58-6932961C9EB4}
 		{FCE03661-803E-4629-944F-45DB6B444320} = {1987061F-8970-4018-8D58-6932961C9EB4}
-		{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{8174DFB5-0C46-440C-A225-C3A9851C2700} = {7682EFFC-681C-4DCC-B5E7-D8449E42DAC9}
 		{A2156D81-1A67-4EAC-8A74-3E459385E4A0} = {7682EFFC-681C-4DCC-B5E7-D8449E42DAC9}
 		{5637ED33-7EB8-4C30-94EE-947C58FDE363} = {1987061F-8970-4018-8D58-6932961C9EB4}
 		{4D10B1BA-494D-4FAF-ADC8-FA5156533EDB} = {1987061F-8970-4018-8D58-6932961C9EB4}
 		{A1DB4A40-10FE-61E7-9ADF-1D16330A9BF3} = {5C86A5C9-ECE1-4FB9-B48C-A9DCF9C3FECC}
 		{72B2FD95-57B6-400B-95D0-96E19EBCF44B} = {1987061F-8970-4018-8D58-6932961C9EB4}
 		{5A381446-409B-4532-8B1A-877D996F7575} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
+		{9130778E-4B00-436C-BD1F-1DFDF95AD2CC} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D5B2E7E3-B727-40A1-BE68-7BAC9B9DE2FE}

diff --git a/nuget/MagicOnion.Hosting.nuspec b/nuget/MagicOnion.Hosting.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MagicOnion.Hosting</id>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <title>MagicOnion.Hosting</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -13,7 +13,7 @@
     <tags>gRPC, HTTP2</tags>
     <dependencies>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="MagicOnion" version="2.0.4"/>
+        <dependency id="MagicOnion" version="2.0.5"/>
         <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="2.2.0"/>
       </group>
     </dependencies>

diff --git a/nuget/MagicOnion.HttpGateway.nuspec b/nuget/MagicOnion.HttpGateway.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MagicOnion.HttpGateway</id>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <title>MagicOnion.HttpGateway</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -13,7 +13,7 @@
         <tags>gRPC, HTTP2</tags>
         <dependencies>
             <group targetFramework=".NETStandard2.0">
-              <dependency id="MagicOnion" version="2.0.4" />
+              <dependency id="MagicOnion" version="2.0.5" />
               <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" />
               <dependency id="Newtonsoft.Json" version="12.0.1" />
             </group>

diff --git a/nuget/MagicOnion.Redis.nuspec b/nuget/MagicOnion.Redis.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MagicOnion.Redis</id>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <title>MagicOnion</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -13,7 +13,7 @@
     <tags>gRPC, HTTP2</tags>
     <dependencies>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="MagicOnion" version="2.0.4" />
+        <dependency id="MagicOnion" version="2.0.5" />
         <dependency id="StackExchange.Redis" version="2.0.519" />
       </group>
     </dependencies>

diff --git a/nuget/MagicOnion.nuspec b/nuget/MagicOnion.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MagicOnion</id>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <title>MagicOnion</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -13,23 +13,23 @@
     <tags>gRPC, HTTP2</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="Grpc" version="1.18.0" />
+        <dependency id="Grpc" version="1.19.0" />
         <dependency id="MessagePack" version="1.7.3.4" />
         <dependency id="System.Buffers" version="4.5.0" />
         <dependency id="System.Collections.Immutable" version="1.5.0" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.1" />
         <dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
       </group>
       <group targetFramework=".NETFramework4.6">
-        <dependency id="Grpc" version="1.18.0" />
+        <dependency id="Grpc" version="1.19.0" />
         <dependency id="MessagePack" version="1.7.3.4" />
         <dependency id="System.Buffers" version="4.5.0" />
         <dependency id="System.Collections.Immutable" version="1.5.0" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.1" />
         <dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
       </group>
       <group targetFramework=".NETFramework4.7.1">
-        <dependency id="Grpc" version="1.18.0" />
+        <dependency id="Grpc" version="1.19.0" />
         <dependency id="MessagePack" version="1.7.3.4" />
         <dependency id="System.Buffers" version="4.5.0" />
         <dependency id="System.Collections.Immutable" version="1.5.0" />
@@ -39,7 +39,7 @@
       <group targetFramework=".NETStandard2.0">
         <dependency id="System.Threading.Tasks.Parallel" version="4.3.0" />
 
-        <dependency id="Grpc" version="1.18.0" />
+        <dependency id="Grpc" version="1.19.0" />
         <dependency id="MessagePack" version="1.7.3.4" />
         <dependency id="System.Buffers" version="4.5.0" />
         <dependency id="System.Collections.Immutable" version="1.5.0" />

diff --git a/nuget/push.bat b/nuget/push.bat
@@ -1,4 +1,4 @@
-nuget push MagicOnion.2.0.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MagicOnion.HttpGateway.2.0.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MagicOnion.Redis.2.0.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MagicOnion.Hosting.2.0.4.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MagicOnion.2.0.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MagicOnion.HttpGateway.2.0.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MagicOnion.Redis.2.0.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MagicOnion.Hosting.2.0.5.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/sandbox/Sandbox.NetCoreServer/Sandbox.NetCoreServer.csproj b/sandbox/Sandbox.NetCoreServer/Sandbox.NetCoreServer.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="1.18.0" />
+    <PackageReference Include="Grpc" Version="1.19.0" />
     <PackageReference Include="MessagePack.UnityShims" Version="1.7.3.4" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />

diff --git a/src/MagicOnion.Client.Unity/Assets/Scripts/ChatShare.cs b/src/MagicOnion.Client.Unity/Assets/Scripts/ChatShare.cs
@@ -94,7 +94,7 @@ public class GamingHubClient : IGamingHubReceiver
 
         public async Task<GameObject> ConnectAsync(Channel grpcChannel, string roomName, string playerName)
         {
-            var client = StreamingHubClient.Connect<IGamingHub, IGamingHubReceiver>(grpcChannel, this);
+            client = StreamingHubClient.Connect<IGamingHub, IGamingHubReceiver>(grpcChannel, this);
 
             var roomPlayers = await client.JoinAsync(roomName, playerName, Vector3.zero, Quaternion.identity);
             foreach (var player in roomPlayers)

diff --git a/src/MagicOnion.Hosting/MagicOnion.Hosting.csproj b/src/MagicOnion.Hosting/MagicOnion.Hosting.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -7,8 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MagicOnion" Version="2.0.3" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MagicOnion\MagicOnion.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/MagicOnion.HttpGateway/MagicOnion.HttpGateway.csproj b/src/MagicOnion.HttpGateway/MagicOnion.HttpGateway.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="1.18.0" />
+    <PackageReference Include="Grpc" Version="1.19.0" />
     <PackageReference Include="MessagePack" Version="1.7.3.4" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

diff --git a/src/MagicOnion/MagicOnion.csproj b/src/MagicOnion/MagicOnion.csproj
@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="1.18.0" />
+    <PackageReference Include="Grpc" Version="1.19.0" />
     <PackageReference Include="MessagePack" Version="1.7.3.4" />
     <PackageReference Include="System.Buffers" Version="4.5.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />

diff --git a/src/MagicOnion/_AssemblyInfo.cs b/src/MagicOnion/_AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("cbfa1f05-746b-47e1-8432-d709f88ce24e")]
 
-[assembly: AssemblyVersion("2.0.4")]
-[assembly: AssemblyFileVersion("2.0.4")]
+[assembly: AssemblyVersion("2.0.5")]
+[assembly: AssemblyFileVersion("2.0.5")]
diff --git a/tests/MagicOnion.Hosting.Tests/TestService.cs b/tests/MagicOnion.Hosting.Tests/TestService.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1998
+
 using System;
 using MagicOnion;
 using MagicOnion.Server;
@@ -15,4 +17,5 @@ public async UnaryResult<int> Sum(int x, int y)
             return x + y;
         }
     }
-}
+}
+#pragma warning restore CS1998
diff --git a/tests/MagicOnion.NetCoreTests/MagicOnion.NetCoreTests.csproj b/tests/MagicOnion.NetCoreTests/MagicOnion.NetCoreTests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.6.0" />
+    <PackageReference Include="Grpc" Version="1.19.0" />
+    <PackageReference Include="MessagePack" Version="1.7.3.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\MagicOnion\MagicOnion.csproj" />
+  </ItemGroup>
+
+</Project>