dynamic to reflect, contracts update

gencebay · gencebay · commit 8e5a062c8a77 · 2018-02-28T21:37:50.000+03:00
diff --git a/src/NetCoreStack.Proxy/Internal/ProxyHelper.cs b/src/NetCoreStack.Proxy/Internal/ProxyHelper.cs
@@ -9,7 +9,7 @@ internal static class ProxyHelper
     {
         internal static TProxy CreateProxy<TProxy>(IServiceProvider container) where TProxy : IApiContract
         {
-            dynamic proxy = DispatchProxyAsync.Create<TProxy, HttpDispatchProxy>();
+            object proxy = DispatchProxyAsync.Create<TProxy, HttpDispatchProxy>();
             var proxyContextFilter = container.GetRequiredService<IProxyContextFilter>();
             var proxyContext = new ProxyContext(typeof(TProxy));
 
@@ -20,8 +20,15 @@ internal static TProxy CreateProxy<TProxy>(IServiceProvider container) where TPr
             }
 
             proxyContextFilter.Invoke(proxyContext);
-            proxy.Initialize(proxyContext, container.GetService<IProxyManager>());
-            return proxy;            
+
+            var initializer = proxy.GetType().GetMethod(nameof(HttpDispatchProxy.Initialize));
+            if (initializer == null)
+            {
+                throw new ArgumentNullException(nameof(initializer));
+            }
+
+            initializer.Invoke(proxy, new[] { proxyContext, (object)container.GetService<IProxyManager>() });
+            return (TProxy)proxy;            
         }
     }
 }
diff --git a/src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj b/src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj
@@ -11,9 +11,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
-    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.6" />
+    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.7" />
     <PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.0.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
   
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/NetCoreStack.Proxy.Mvc.Hosting.csproj b/test/NetCoreStack.Proxy.Mvc.Hosting/NetCoreStack.Proxy.Mvc.Hosting.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj b/test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
-    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.6" />
+    <PackageReference Include="NetCoreStack.Contracts" Version="2.0.7" />
   </ItemGroup>
 
 </Project>
diff --git a/test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj b/test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj
@@ -11,8 +11,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="Moq" Version="4.8.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
+    <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/test/NetCoreStack.Proxy.Tests/httplive.db b/test/NetCoreStack.Proxy.Tests/httplive.db

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal static class ProxyHelper`
`9`	`9`	`{`
`10`	`10`	`internal static TProxy CreateProxy<TProxy>(IServiceProvider container) where TProxy : IApiContract`
`11`	`11`	`{`
`12`		`- dynamic proxy = DispatchProxyAsync.Create<TProxy, HttpDispatchProxy>();`
	`12`	`+ object proxy = DispatchProxyAsync.Create<TProxy, HttpDispatchProxy>();`
`13`	`13`	`var proxyContextFilter = container.GetRequiredService<IProxyContextFilter>();`
`14`	`14`	`var proxyContext = new ProxyContext(typeof(TProxy));`
`15`	`15`
`@@ -20,8 +20,15 @@ internal static TProxy CreateProxy<TProxy>(IServiceProvider container) where TPr`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`proxyContextFilter.Invoke(proxyContext);`
`23`		`- proxy.Initialize(proxyContext, container.GetService<IProxyManager>());`
`24`		`- return proxy;`
	`23`	`+`
	`24`	`+ var initializer = proxy.GetType().GetMethod(nameof(HttpDispatchProxy.Initialize));`
	`25`	`+ if (initializer == null)`
	`26`	`+ {`
	`27`	`+ throw new ArgumentNullException(nameof(initializer));`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ initializer.Invoke(proxy, new[] { proxyContext, (object)container.GetService<IProxyManager>() });`
	`31`	`+ return (TProxy)proxy;`
`25`	`32`	`}`
`26`	`33`	`}`
`27`	`34`	`}`