Skip to content

Commit ce334de

Browse files
committed
Framework dependencies netstandard1.3 and netstandard1.6
1 parent 5443197 commit ce334de

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

src/NetCoreStack.DispatchProxyAsync/AsyncDispatchProxyGenerator.cs

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,6 @@ private static Type GenerateProxyType(Type baseType, Type interfaceType)
160160
pb.AddInterfaceImpl(interfaceType);
161161

162162
Type generatedProxyType = pb.CreateType();
163-
164-
#if NET451
165-
s_proxyAssembly._ab.Save("ProxyBuilder2.dll");
166-
#endif
167-
168163
return generatedProxyType;
169164
}
170165

@@ -287,20 +282,11 @@ private class ProxyAssembly
287282

288283
public ProxyAssembly()
289284
{
290-
#if NET451
291-
AssemblyBuilderAccess access = AssemblyBuilderAccess.RunAndSave;
292-
#else
293285
AssemblyBuilderAccess access = AssemblyBuilderAccess.Run;
294-
#endif
295286
var assemblyName = new AssemblyName("ProxyBuilder2");
296287
assemblyName.Version = new Version(1, 0, 0);
297288
_ab = AssemblyBuilder.DefineDynamicAssembly(assemblyName, access);
298-
299-
#if NET451
300-
_mb = _ab.DefineDynamicModule("testmod", "ProxyBuilder2.dll");
301-
#else
302289
_mb = _ab.DefineDynamicModule("testmod");
303-
#endif
304290
}
305291

306292
// Gets or creates the ConstructorInfo for the IgnoresAccessChecksAttribute.
@@ -465,9 +451,9 @@ internal MethodBase ResolveMethodToken(Type type, int token)
465451

466452
private class ProxyBuilder
467453
{
468-
private static readonly MethodInfo s_delegateInvoke = typeof(DispatchProxyHandler).GetTypeInfo().GetMethod("InvokeHandle");
469-
private static readonly MethodInfo s_delegateInvokeAsync = typeof(DispatchProxyHandler).GetTypeInfo().GetMethod("InvokeAsyncHandle");
470-
private static readonly MethodInfo s_delegateinvokeAsyncT = typeof(DispatchProxyHandler).GetTypeInfo().GetMethod("InvokeAsyncHandleT");
454+
private static readonly MethodInfo s_delegateInvoke = typeof(DispatchProxyHandler).GetMethod("InvokeHandle");
455+
private static readonly MethodInfo s_delegateInvokeAsync = typeof(DispatchProxyHandler).GetMethod("InvokeAsyncHandle");
456+
private static readonly MethodInfo s_delegateinvokeAsyncT = typeof(DispatchProxyHandler).GetMethod("InvokeAsyncHandleT");
471457

472458
private ProxyAssembly _assembly;
473459
private TypeBuilder _tb;

src/NetCoreStack.DispatchProxyAsync/project.json

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,28 @@
22
"version": "1.0.0-*",
33

44
"dependencies": {
5-
"NETStandard.Library": "1.6.1"
5+
"NETStandard.Library": "1.6.1",
6+
"System.Reflection.Emit": "4.3.0",
7+
"System.Reflection.TypeExtensions": "4.3.0"
68
},
79

810
"frameworks": {
9-
"net451": {},
10-
"netstandard1.6": {
11+
"netstandard1.3": {
1112
"dependencies": {
12-
"System.Reflection.Emit": "4.3.0",
13-
"System.Reflection.TypeExtensions": "4.3.0"
13+
"Microsoft.NETCore.Platforms": "1.1.0",
14+
"System.Collections": "4.3.0",
15+
"System.Diagnostics.Debug": "4.3.0",
16+
"System.Linq": "4.3.0",
17+
"System.Reflection": "4.3.0",
18+
"System.Reflection.Emit.ILGeneration": "4.3.0",
19+
"System.Reflection.Extensions": "4.3.0",
20+
"System.Reflection.Primitives": "4.3.0",
21+
"System.Resources.ResourceManager": "4.3.0",
22+
"System.Runtime": "4.3.0",
23+
"System.Threading": "4.3.0",
24+
"System.Runtime.InteropServices": "4.3.0"
1425
}
15-
}
26+
},
27+
"netstandard1.6": {}
1628
}
1729
}

test/NetCoreStack.DispatchProxyAsync.Tests/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
},
2222
"System.Diagnostics.TraceSource": "4.3.0-*"
2323
}
24-
},
25-
"net451": {}
24+
}
2625
}
2726
}

test/NetCoreStack.Test.Common/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33

44
"dependencies": {
55
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
6-
"NetCoreStack.Common": "1.0.0-rc-36",
6+
"NetCoreStack.Common": "1.0.0-*",
77
"NetCoreStack.DispatchProxyAsync": "1.0.0-*",
88
"NETStandard.Library": "1.6.1"
99
},
1010

1111
"frameworks": {
12-
"net451": {},
1312
"netstandard1.6": {}
1413
}
1514
}

test/WebClient/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
},
3030

3131
"frameworks": {
32-
"net451": {},
3332
"netcoreapp1.1": {
3433
"dependencies": {
3534
"Microsoft.NETCore.App": {

0 commit comments

Comments
 (0)