Merge pull request #13 from Chavoshi/master

.Net Standard & .Net Core Support Added

Author: ENikS

src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.cs

@@ -43,7 +43,7 @@ static InterfaceInterceptorClassGenerator()
                 pair = ms.ToArray();
             }
 
-            AssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(
+            AssemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
                 new AssemblyName("Unity_ILEmit_InterfaceProxies") { KeyPair = new StrongNameKeyPair(pair) },
 #if DEBUG_SAVE_GENERATED_ASSEMBLY
                 AssemblyBuilderAccess.RunAndSave);
@@ -129,7 +129,7 @@ public Type CreateProxyType()
 
             AddConstructor();
 
-            Type result = _typeBuilder.CreateType();
+            Type result = _typeBuilder.CreateTypeInfo().AsType();
 #if DEBUG_SAVE_GENERATED_ASSEMBLY
             assemblyBuilder.Save("Unity_ILEmit_InterfaceProxies.dll");
 #endif

src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.cs

@@ -28,7 +28,7 @@ public partial class InterceptingClassGenerator
 
         static InterceptingClassGenerator()
         {
-            AssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(
+            AssemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
                 new AssemblyName("Unity_ILEmit_DynamicClasses"),
 #if DEBUG_SAVE_GENERATED_ASSEMBLY
                 AssemblyBuilderAccess.RunAndSave);
@@ -70,7 +70,7 @@ public Type GenerateType()
                         .Implement(implementedInterfaces, memberCount);
             }
 
-            Type result = _typeBuilder.CreateType();
+            Type result = _typeBuilder.CreateTypeInfo().AsType();
 #if DEBUG_SAVE_GENERATED_ASSEMBLY
             assemblyBuilder.Save("Unity_ILEmit_DynamicClasses.dll");
 #endif

src/Unity.Interception.csproj

@@ -19,6 +19,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>package.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
+    <TargetFrameworks>netstandard2.0;net47;net46;net45;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,6 +34,10 @@
     <None Remove="package.snk" />
     <EmbeddedResource Include="package.snk" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
@@ -46,18 +51,16 @@
     <EmbeddedResource Remove="Utilities\net 4.0\**" />
     <None Remove="Utilities\net 4.0\**" />
   </ItemGroup>
-  
-  
+
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <TargetFrameworks>net47;net46;net45;net40</TargetFrameworks>
     <OutputPath>$(SolutionDir)lib</OutputPath>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <TargetFramework>net47</TargetFramework>
+    <DebugType>Full</DebugType>
   </PropertyGroup>
 
 
@@ -73,4 +76,20 @@
     <PackageReference Include="Unity.Abstractions" Version="$(UnityAbstractionsVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+    <Reference Include="System.Runtime.Remoting" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
+    <Reference Include="System.Runtime.Remoting" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net47'">
+    <Reference Include="System.Runtime.Remoting" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <Compile Remove="Interceptors\InstanceInterceptors\TransparentProxyInterception\*.cs" />
+  </ItemGroup>
+
 </Project>