.Net Core

src/DynamicProxyInterceptorAcceptanceTests.cs → src/StructureMap.DynamicInterception.Testing/DynamicProxyInterceptorAcceptanceTests.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-namespace StructureMap.Testing.Acceptance
+namespace StructureMap.DynamicInterception.Testing
 {
     public class DynamicProxyInterceptorAcceptanceTests
     {

src/StructureMap.DynamicInterception.Testing/Properties/AssemblyInfo.cs

@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("StructureMap.DynamicInterception.Testing")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e799a9c9-48b8-45fd-b23a-439e9653049c")]

src/StructureMap.DynamicInterception.Testing/StructureMap.DynamicInterception.Testing.xproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>e799a9c9-48b8-45fd-b23a-439e9653049c</ProjectGuid>
+    <RootNamespace>StructureMap.DynamicInterception.Testing</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

src/StructureMap.DynamicInterception.Testing/project.json

@@ -0,0 +1,28 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "debugType": "portable"
+  },
+  "dependencies": {
+    "System.Runtime.Serialization.Primitives": "4.1.1",
+    "xunit": "2.2.0-beta2-build3300",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029",
+    "Shouldly": "2.8.1",
+    "StructureMap.DynamicInterception": { "target": "project" }
+  },
+  "testRunner": "xunit",
+  "frameworks": {
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0"
+        }
+      },
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
+    }
+  }
+}

src/StructureMap.DynamicInterception.sln

@@ -0,0 +1,33 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StructureMap.DynamicInterception", "StructureMap.DynamicInterception\StructureMap.DynamicInterception.xproj", "{71072204-985A-45E5-A7ED-7EB970EF4515}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StructureMap.DynamicInterception.Testing", "StructureMap.DynamicInterception.Testing\StructureMap.DynamicInterception.Testing.xproj", "{E799A9C9-48B8-45FD-B23A-439E9653049C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{13872EEB-8842-4315-A97F-9D7760ADC655}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{71072204-985A-45E5-A7ED-7EB970EF4515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71072204-985A-45E5-A7ED-7EB970EF4515}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71072204-985A-45E5-A7ED-7EB970EF4515}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71072204-985A-45E5-A7ED-7EB970EF4515}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E799A9C9-48B8-45FD-B23A-439E9653049C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E799A9C9-48B8-45FD-B23A-439E9653049C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E799A9C9-48B8-45FD-B23A-439E9653049C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E799A9C9-48B8-45FD-B23A-439E9653049C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

src/StructureMap.DynamicInterception/ReflectionHelper.cs

@@ -61,7 +61,7 @@ public static bool IsNonGenericTask(Type type)
 
         public static bool IsGenericTask(Type type)
         {
-            return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Task<>);
+            return type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == typeof(Task<>);
         }
 
         public static async Task ConvertInvocationResultToTask(IMethodInvocationResult methodInvocationResult)

src/StructureMap.DynamicInterception/StructureMap.DynamicInterception.xproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>71072204-985a-45e5-a7ed-7eb970ef4515</ProjectGuid>
+    <RootNamespace>StructureMap.DynamicInterception</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

src/StructureMap.DynamicInterception/project.json

@@ -0,0 +1,21 @@
+{
+  "version": "1.0.0-*",
+  "title": "StructureMap.DynamicInterception",
+  "dependencies": {
+    "Castle.Core": "4.0.0-beta001",
+    "StructureMap": "4.3.0"
+  },
+  "frameworks": {
+    "net45": {
+      "dependencies": {
+      }
+    },
+    "netstandard1.3": {
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "NETStandard.Library": "1.6.0"
+      }
+    }
+  }
+}

src/global.json

@@ -0,0 +1,6 @@
+{
+    "projects": [
+        "StructureMap.DynamicInterception",
+        "StructureMap.DynamicInterception.Testing"
+    ]
+}