Merge pull request #23 from ekonbenefits/net-standard

Porting to cross compile to .net standard 2.0

Author: jbtule

.appveyor.yml

@@ -8,6 +8,10 @@ configuration: Debug
 build: off
 
 skip_branch_with_pr: true
+skip_tags: true
+
+before_deploy:
+  - ps: $env:VersionPrefix=(Select-Xml -Path ./Version.props -XPath "/Project/PropertyGroup/VersionPrefix").Node.'#text'
 
 environment:
   vsuffix: alpha$(APPVEYOR_BUILD_NUMBER)
@@ -24,26 +28,50 @@ test:
     except:
       - Performance
 
+after_test:
+  - ps: dotnet test .\Tests\UnitTestImpromptuInterface\UnitTestImpromptuInterface.csproj -f netcoreapp2.0 --no-build --no-restore --filter=TestCategory!=Performance --logger="trx;LogFileName=testresults.trx" --configuration=$env:configuration
+
+on_finish:
+  - ps: $wc = New-Object 'System.Net.WebClient'
+  - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\Tests\UnitTestImpromptuInterface\TestResults\testresults.trx))
+
+
+deploy:
+  - provider: NuGet
+    server: https://www.myget.org/F/dynamitey-ci/api/v2/package
+    api_key:
+      secure: yKbBrG0QiTfXUvND1/cMMNHxH1Bgal5g7c0pWGwqvjCtKGTtWkpvE2KlZb6E2ZgB
+    skip_symbols: false
+    symbol_server: https://www.myget.org/F/dynamitey-ci/symbols/api/v2/package
+
+  - provider: GitHub
+    artifact: /.*\.nupkg/           # upload all NuGet packages to release assets
+    tag: v$(VersionPrefix)$(vsuffix)
+    description: 'Release description'
+    auth_token:
+      secure: JyJYSgeJYFmkaFy7Gro2dQyv/fqZwz1EzJmp2Nf99H6HUpxNR7ilA/OGPcQk0pA8
+    draft: true
+    prerelease: $(is_prerelease)
+
+
 artifacts:
   - path: ImpromptuInterface\bin\$(configuration)\*.nupkg
     name: ImpromptuInterface
 
 for:
   - branches:
         except:
-          - /v.*/
+          - /deploy-v.*/
   - branches:
         only:
-          - /v.*-beta/
+          - /deploy-v.*-beta.*/
     environment:
       vsuffix: beta$(APPVEYOR_BUILD_NUMBER)
       is_prerelease: true
   - branches:
         only:
-          - /v[\d,.]*/
+          - /deploy-v[\d,.]*/
     configuration: Release
     environment:
       vsuffix: $(APPVEYOR_BUILD_NUMBER)
-      is_prerelease: false
-
-
+      is_prerelease: false

.ci/RunTests.sh

@@ -1,14 +1,14 @@
 #!/bin/sh -x
 
 runTest(){
-    mono --runtime=v4.0 packages/nunit.runners/2.6.1/tools/nunit-console.exe -noxml -nodots -labels $@
+   mono --runtime=v4.0 packages/nunit.consolerunner/3.7.0/tools/nunit3-console.exe --noresult -labels=All "$@"
    if [ $? -ne 0 ]
    then   
      exit 1
    fi
 }
 
-runTest Tests/UnitTestImpromptuInterface/bin/Debug/UnitTestImpromptuInterface.dll -exclude=Performance
-runTest Tests/UnitTestImpromptuInterface.Clay/bin/Debug/UnitTestImpromptuInterface.Clay.dll -exclude=Performance
-
+runTest Tests/UnitTestImpromptuInterface/bin/Debug/net462/UnitTestImpromptuInterface.exe --where="cat != Performance"
+runTest Tests/UnitTestImpromptuInterface.Clay/bin/Debug/UnitTestImpromptuInterface.Clay.dll --where="cat != Performance"
+dotnet test Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj -f netcoreapp2.0 --no-build --no-restore --filter="TestCategory!=Performance" --configuration=Debug  
 exit $?

.nuget/NuGet.Config

@@ -8,11 +8,12 @@ matrix:
       dist: trusty
       sudo: required
     - os: osx
+      osx_image: "xcode8.3"
 
 solution: ImpromptuInterface.sln
 
-mono:
-  - beta
+mono: beta
+dotnet: 2.0.0
 
 install:
   - msbuild /t:restore

.travis.yml

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
-<TargetFramework>net40</TargetFramework>
+<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
 <SignAssembly>True</SignAssembly>
 <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
 <Description>A Lightweight Duck Casting Framework for dynamic C#</Description>
@@ -18,11 +18,15 @@
 </PropertyGroup>
 <Import Project="..\Version.props" />
 <ItemGroup>
-<PackageReference Include="Dynamitey" Version="2.0.5-alpha87" />
-</ItemGroup>
-<ItemGroup>
-<Reference Include="Microsoft.CSharp" />
+<PackageReference Include="Dynamitey" Version="2.0.6-beta111" />
 </ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)'=='net40'">
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.*" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.*" />
+  </ItemGroup>
 <ItemGroup>
   <Folder Include="Properties\" />
 </ItemGroup>

ImpromptuInterface/ImpromptuInterface.csproj

@@ -27,7 +27,27 @@ namespace ImpromptuInterface.Build
     using System.Reflection.Emit;
     using System.Runtime.CompilerServices;
     using Microsoft.CSharp.RuntimeBinder;
-  
+
+
+
+#if NET40
+    internal static class CompatHelper
+    {
+        public static Type GetTypeInfo(this Type type) => type;
+
+        public static Type CreateTypeInfo(this TypeBuilder builder) => builder.CreateType();
+
+        public static AssemblyBuilder DefineDynamicAssembly(AssemblyName name, AssemblyBuilderAccess access) => AppDomain.CurrentDomain.DefineDynamicAssembly(name, access);
+    }
+
+#else
+    internal static class CompatHelper
+    {
+        public static AssemblyBuilder DefineDynamicAssembly(AssemblyName name, AssemblyBuilderAccess access) => AssemblyBuilder.DefineDynamicAssembly(name, access);
+
+    }
+
+#endif
 
     ///<summary>
     /// Does most of the work buiding and caching proxies
@@ -58,7 +78,8 @@ public static TInterface RecursiveActLike<TInterface>(object target) where TInte
         }
 
 
-#if !SILVERLIGHT
+#if NET40
+
         internal class TempBuilder : IDisposable
         {
             private readonly string _name;
@@ -104,8 +125,8 @@ public static IDisposable WriteOutDll(string name)
 
               return new TempBuilder(name);
         }
-
 #endif
+    
 
 
         /// <summary>
@@ -240,7 +261,7 @@ private static Type BuildTypeHelper(ModuleBuilder builder, Type contextType, IDi
                 MakePropertyDescribedProperty(builder, tB, contextType, tInterface.Key, tInterface.Value);
 
             }
-            var tType = tB.CreateType();
+            var tType = tB.CreateTypeInfo();
             return tType;
         }
 
@@ -375,7 +396,7 @@ private static Type BuildTypeHelper(ModuleBuilder builder,Type contextType,param
                     MakeEvent(builder, tInfo, tB, contextType, defaultImp: tPropertyNameHash.Add(tInfo.Name));
                 }
             }
-            var tType = tB.CreateType();
+            var tType = tB.CreateTypeInfo();
             return tType;
         }
 
@@ -563,7 +584,7 @@ private static void MakeMethod(ModuleBuilder builder,MethodInfo info, TypeBuilde
 
 
 
-            var tCallSite = tCStp.CreateType();
+            Type tCallSite = tCStp.CreateTypeInfo();
 
             var tPublicPrivate = MethodAttributes.Public;
             var tPrefixName = tEmitInfo.Name;
@@ -891,7 +912,7 @@ private static void MakeEvent(ModuleBuilder builder, EventInfo info, TypeBuilder
 
             tEmitInfo.CallSiteInvokeSetFuncType = tCStp.DefineCallsiteField(tEmitInfo.CallSiteInvokeSetName, typeof(object), typeof(object));
 
-            tEmitInfo.CallSiteType = tCStp.CreateType();
+            tEmitInfo.CallSiteType = tCStp.CreateTypeInfo();
 
             var tMp = typeBuilder.DefineEvent(info.Name, EventAttributes.None, tEmitInfo.ResolveReturnType);
 
@@ -1228,7 +1249,7 @@ private static void MakePropertyHelper(ModuleBuilder builder, TypeBuilder typeBu
                 emitInfo.CallSiteInvokeSetFuncType = tCStp.DefineCallsiteField(tInvokeSet, typeof(object), emitInfo.ResolvedParamTypes);
             }
 
-            emitInfo.CallSiteType = tCStp.CreateType();
+            emitInfo.CallSiteType = tCStp.CreateTypeInfo();
 
 
 
@@ -1676,7 +1697,7 @@ private static Type GenerateFullDelegate(TypeBuilder builder, Type returnType,
 
 
 
-                return tBuilder.CreateType();
+                return tBuilder.CreateTypeInfo();
 
         }
 
@@ -1711,15 +1732,15 @@ private static void GenerateAssembly(string name, AssemblyBuilderAccess access,
             var tName = new AssemblyName(name);
 
             ab =
-                AppDomain.CurrentDomain.DefineDynamicAssembly(
+                CompatHelper.DefineDynamicAssembly(
                     tName,
                     access);
 
-            #if !SILVERLIGHT
+#if NET40
             if (access== AssemblyBuilderAccess.RunAndSave || access == AssemblyBuilderAccess.Save)
                 mb = ab.DefineDynamicModule("MainModule", string.Format("{0}.dll", tName.Name));
             else
-            #endif
+#endif
             mb = ab.DefineDynamicModule("MainModule");
         }
     }

ImpromptuInterface/src/EmitProxy/BuildProxy.cs

@@ -558,17 +558,6 @@ public static void EmitTypeOf(this ILGenerator generator, Type type)
         }
 
 
-        /// <summary>
-        /// Emits the typeof(Type)
-        /// </summary>
-        /// <param name="generator">The generator.</param>
-        /// <param name="type">The type.</param>
-        public static void EmitTypeOf(this ILGenerator generator, TypeToken type)
-        {
-
-            generator.Emit(OpCodes.Ldtoken, type.Token);
-            var tTypeMeth = typeof(Type).GetMethod("GetTypeFromHandle", new[] { typeof(RuntimeTypeHandle) });
-            generator.Emit(OpCodes.Call, tTypeMeth);
-        }
+      
     }
 }

ImpromptuInterface/src/EmitProxy/EmitExtensions.cs

@@ -1,4 +1,4 @@
-.net 4.0 framework to allow you to wrap any object (static or dynamic) with a static interface even though it didn't inherit from it. It does this by emitting cached dynamic binding code inside a proxy.
+net4.0/netstd2.0 framework to allow you to wrap any object (static or dynamic) with a static interface even though it didn't inherit from it. It does this by emitting cached dynamic binding code inside a proxy.
 
 ImpromptuInterface is available Nuget [![NuGet](https://img.shields.io/nuget/dt/ImpromptuInterface.svg)](https://www.nuget.org/packages/ImpromptuInterface/)
 

Readme.md

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTestImpromptuInterface.Clay</RootNamespace>
     <AssemblyName>UnitTestImpromptuInterface.Clay</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\impromptuinterface\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,13 +33,14 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="1.1.*" />
     <PackageReference Include="Castle.DynamicProxy" Version="2.1.*" />
     <PackageReference Include="IronPython" Version="2.7.*" />
     <PackageReference Include="log4net" Version="1.2.10" />
-    <PackageReference Include="NUnit" Version="2.6.1" />
+    <PackageReference Include="NUnit" Version="3.7.1" />
     <PackageReference Include="Clay" Version="1.0" />
   </ItemGroup>
   <ItemGroup>