ready for 0.5.0

Cysharp · Jun 5, 2017 · f4c386f · f4c386f
1 parent c72e281
commit f4c386f
Show file tree

Hide file tree

Showing 20 changed files with 386 additions and 448 deletions.
diff --git a/MagicOnion.sln b/MagicOnion.sln
@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox.ConsoleServer2", "s
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.Tests.NetCore", "tests\MagicOnion.Tests.NetCore\MagicOnion.Tests.NetCore.csproj", "{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox.NetCoreApp", "sandbox\Sandbox.NetCoreApp\Sandbox.NetCoreApp.csproj", "{C2ADB989-07E8-46AC-8495-AE496F69C5C0}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		sandbox\SharedProjectLibrary\SharedProjectLibrary.projitems*{5526fa31-4f38-4ff7-96ee-a73bf495e1ee}*SharedItemsImports = 13
@@ -89,6 +91,10 @@ Global
 		{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
+		{C2ADB989-07E8-46AC-8495-AE496F69C5C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2ADB989-07E8-46AC-8495-AE496F69C5C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2ADB989-07E8-46AC-8495-AE496F69C5C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2ADB989-07E8-46AC-8495-AE496F69C5C0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -105,5 +111,6 @@ Global
 		{A9E28AFD-4FEC-416A-9F85-C64F05605B22} = {7682EFFC-681C-4DCC-B5E7-D8449E42DAC9}
 		{7CF23E57-381B-428D-B44A-D5328A71414B} = {7682EFFC-681C-4DCC-B5E7-D8449E42DAC9}
 		{A0E9C1EA-6E7F-4CF1-81D2-21EAC6ACAE67} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
+		{C2ADB989-07E8-46AC-8495-AE496F69C5C0} = {7682EFFC-681C-4DCC-B5E7-D8449E42DAC9}
 	EndGlobalSection
 EndGlobal
diff --git a/nuget/MagicOnion.HttpGateway.nuspec b/nuget/MagicOnion.HttpGateway.nuspec
@@ -2,29 +2,39 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MagicOnion.HttpGateway</id>
-        <version>0.4.0-alpha</version>
+        <version>0.5.0</version>
         <title>MagicOnion.HttpGateway</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
         <projectUrl>https://github.com/neuecc/MagicOnion</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>HTTP1 JSON Gateway and Swagger Integration for MagicOnion.</description>
-        <releaseNotes>update dependency.</releaseNotes>
+        <releaseNotes>Support .NET Core.</releaseNotes>
         <tags>gRPC, HTTP2</tags>
-        <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
-        </frameworkAssemblies>
         <dependencies>
-            <group targetFramework=".NETFramework4.5">
-                <dependency id="MagicOnion" version="0.4.0-alpha" />
+            <group targetFramework=".NETFramework4.6">
+                <dependency id="MagicOnion" version="0.5.0" />
                 <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="1.1.0" />
-                <dependency id="Newtonsoft.Json" version="9.0.1" />
+                <dependency id="Newtonsoft.Json" version="10.0.2" />
+            </group>
+            <group targetFramework=".NETFramework4.7">
+                <dependency id="MagicOnion" version="0.5.0" />
+                <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="1.1.0" />
+                <dependency id="Newtonsoft.Json" version="10.0.2" />
+            </group>
+            <group targetFramework=".NETStandard1.5">
+                <dependency id="MagicOnion" version="0.5.0" />
+                <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="1.1.0" />
+                <dependency id="Newtonsoft.Json" version="10.0.2" />
             </group>
         </dependencies>
     </metadata>
     <files>
-        <file src="..\src\MagicOnion.HttpGateway\bin\Release\MagicOnion.HttpGateway.dll" target="lib\net45" />
-        <file src="..\src\MagicOnion.HttpGateway\bin\Release\MagicOnion.HttpGateway.xml" target="lib\net45" />
+        <file src="..\src\MagicOnion.HttpGateway\bin\Release\net46\MagicOnion.HttpGateway.dll" target="lib\net46" />
+        <file src="..\src\MagicOnion.HttpGateway\bin\Release\net46\MagicOnion.HttpGateway.xml" target="lib\net46" />
+        <file src="..\src\MagicOnion.HttpGateway\bin\Release\net47\MagicOnion.HttpGateway.dll" target="lib\net47" />
+        <file src="..\src\MagicOnion.HttpGateway\bin\Release\net47\MagicOnion.HttpGateway.xml" target="lib\net47" />
+        <file src="..\src\MagicOnion.HttpGateway\bin\Release\netstandard1.5\MagicOnion.HttpGateway.dll" target="lib\netstandard1.5" />
+        <file src="..\src\MagicOnion.HttpGateway\bin\Release\netstandard1.5\MagicOnion.HttpGateway.xml" target="lib\netstandard1.5" />
     </files>
 </package>
diff --git a/nuget/MagicOnion.nuspec b/nuget/MagicOnion.nuspec
@@ -2,29 +2,38 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MagicOnion</id>
-        <version>0.4.0-alpha</version>
+        <version>0.5.0</version>
         <title>MagicOnion</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
         <projectUrl>https://github.com/neuecc/MagicOnion</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>gRPC based HTTP2 RPC Streaming Framework for .NET, .NET Core and Unity.</description>
-        <releaseNotes>Add ChannelContext, StreamingContextRepository, StreamingContextGroup.</releaseNotes>
+        <releaseNotes>Support .NET Core.</releaseNotes>
         <tags>gRPC, HTTP2</tags>
-        <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
-        </frameworkAssemblies>
         <dependencies>
-            <group targetFramework=".NETFramework4.5">
-                <dependency id="Grpc" version="1.2.0" />
-                <dependency id="MessagePack" version="1.1.2" />
+            <group targetFramework=".NETFramework4.6">
+                <dependency id="Grpc" version="1.3.6" />
+                <dependency id="MessagePack" version="1.2.3" />
+            </group>
+            <group targetFramework=".NETFramework4.7">
+                <dependency id="Grpc" version="1.3.6" />
+                <dependency id="MessagePack" version="1.2.3" />
+            </group>
+            <group targetFramework=".NETStandard1.5">
+                <dependency id="Grpc" version="1.3.6" />
+                <dependency id="MessagePack" version="1.2.3" />
+                <dependency id="System.Threading.Tasks.Parallel" version="4.3.0" />
             </group>
         </dependencies>
     </metadata>
     <files>
-        <file src="..\src\MagicOnion\bin\Release\MagicOnion.dll" target="lib\net45" />
-        <file src="..\src\MagicOnion\bin\Release\MagicOnion.xml" target="lib\net45" />
+        <file src="..\src\MagicOnion\bin\Release\net46\MagicOnion.dll" target="lib\net46" />
+        <file src="..\src\MagicOnion\bin\Release\net46\MagicOnion.xml" target="lib\net46" />
+        <file src="..\src\MagicOnion\bin\Release\net47\MagicOnion.dll" target="lib\net47" />
+        <file src="..\src\MagicOnion\bin\Release\net47\MagicOnion.xml" target="lib\net47" />
+        <file src="..\src\MagicOnion\bin\Release\netstandard1.5\MagicOnion.dll" target="lib\netstandard1.5" />
+        <file src="..\src\MagicOnion\bin\Release\netstandard1.5\MagicOnion.xml" target="lib\netstandard1.5" />
         <file src="tools\*" target="tools" />
     </files>
 </package>
diff --git a/nuget/push.bat b/nuget/push.bat
@@ -1,2 +1,2 @@
-nuget push MagicOnion.0.4.0-alpha.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MagicOnion.HttpGateway.0.4.0-alpha.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MagicOnion.0.5.0.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MagicOnion.HttpGateway.0.5.0.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/sandbox/Sandbox.ConsoleServer/App.config b/sandbox/Sandbox.ConsoleServer/App.config
@@ -18,7 +18,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
@@ -32,6 +32,78 @@
 
                 </dependentAssembly>
 
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.AspNetCore.Http.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.AspNetCore.Http.Features" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.AspNetCore.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.Extensions.ObjectPool" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+
+                </dependentAssembly>
+
+                <dependentAssembly>
+
+                        <assemblyIdentity name="Microsoft.Net.Http.Headers" publicKeyToken="adb9793829ddae60" culture="neutral" />
+
+                        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+
+                </dependentAssembly>
+
         </assemblyBinding>
     </runtime>
 </configuration>