Skip to content

Commit db07d3a

Browse files
jeremydmillerjeremydmiller
authoredSep 2, 2016
Merge pull request #5 from DixonDs/net-core
.Net Core
2 parents 91bd106 + c548a9c commit db07d3a

11 files changed

+151
-112
lines changed
 

‎src/DynamicProxyInterceptorAcceptanceTests.cs renamed to ‎src/StructureMap.DynamicInterception.Testing/DynamicProxyInterceptorAcceptanceTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading.Tasks;
66
using Xunit;
77

8-
namespace StructureMap.Testing.Acceptance
8+
namespace StructureMap.DynamicInterception.Testing
99
{
1010
public class DynamicProxyInterceptorAcceptanceTests
1111
{

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

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

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

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
9+
<PropertyGroup Label="Globals">
10+
<ProjectGuid>e799a9c9-48b8-45fd-b23a-439e9653049c</ProjectGuid>
11+
<RootNamespace>StructureMap.DynamicInterception.Testing</RootNamespace>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
14+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
15+
</PropertyGroup>
16+
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>

‎src/StructureMap.DynamicInterception.Testing/project.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "1.0.0-*",
3+
"buildOptions": {
4+
"debugType": "portable"
5+
},
6+
"dependencies": {
7+
"System.Runtime.Serialization.Primitives": "4.1.1",
8+
"xunit": "2.2.0-beta2-build3300",
9+
"dotnet-test-xunit": "2.2.0-preview2-build1029",
10+
"Shouldly": "2.8.1",
11+
"StructureMap.DynamicInterception": { "target": "project" }
12+
},
13+
"testRunner": "xunit",
14+
"frameworks": {
15+
"netcoreapp1.0": {
16+
"dependencies": {
17+
"Microsoft.NETCore.App": {
18+
"type": "platform",
19+
"version": "1.0.0"
20+
}
21+
},
22+
"imports": [
23+
"dotnet5.4",
24+
"portable-net451+win8"
25+
]
26+
}
27+
}
28+
}

‎src/StructureMap.DynamicInterception.sln

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StructureMap.DynamicInterception", "StructureMap.DynamicInterception\StructureMap.DynamicInterception.xproj", "{71072204-985A-45E5-A7ED-7EB970EF4515}"
7+
EndProject
8+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StructureMap.DynamicInterception.Testing", "StructureMap.DynamicInterception.Testing\StructureMap.DynamicInterception.Testing.xproj", "{E799A9C9-48B8-45FD-B23A-439E9653049C}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{13872EEB-8842-4315-A97F-9D7760ADC655}"
11+
ProjectSection(SolutionItems) = preProject
12+
global.json = global.json
13+
EndProjectSection
14+
EndProject
15+
Global
16+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17+
Debug|Any CPU = Debug|Any CPU
18+
Release|Any CPU = Release|Any CPU
19+
EndGlobalSection
20+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21+
{71072204-985A-45E5-A7ED-7EB970EF4515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22+
{71072204-985A-45E5-A7ED-7EB970EF4515}.Debug|Any CPU.Build.0 = Debug|Any CPU
23+
{71072204-985A-45E5-A7ED-7EB970EF4515}.Release|Any CPU.ActiveCfg = Release|Any CPU
24+
{71072204-985A-45E5-A7ED-7EB970EF4515}.Release|Any CPU.Build.0 = Release|Any CPU
25+
{E799A9C9-48B8-45FD-B23A-439E9653049C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{E799A9C9-48B8-45FD-B23A-439E9653049C}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{E799A9C9-48B8-45FD-B23A-439E9653049C}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{E799A9C9-48B8-45FD-B23A-439E9653049C}.Release|Any CPU.Build.0 = Release|Any CPU
29+
EndGlobalSection
30+
GlobalSection(SolutionProperties) = preSolution
31+
HideSolutionNode = FALSE
32+
EndGlobalSection
33+
EndGlobal

‎src/StructureMap.DynamicInterception/ReflectionHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static bool IsNonGenericTask(Type type)
6161

6262
public static bool IsGenericTask(Type type)
6363
{
64-
return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Task<>);
64+
return type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == typeof(Task<>);
6565
}
6666

6767
public static async Task ConvertInvocationResultToTask(IMethodInvocationResult methodInvocationResult)

‎src/StructureMap.DynamicInterception/StructureMap.DynamicInterception.csproj

-109
This file was deleted.

‎src/StructureMap.DynamicInterception/StructureMap.DynamicInterception.xproj

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
9+
<PropertyGroup Label="Globals">
10+
<ProjectGuid>71072204-985a-45e5-a7ed-7eb970ef4515</ProjectGuid>
11+
<RootNamespace>StructureMap.DynamicInterception</RootNamespace>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
14+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
15+
</PropertyGroup>
16+
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>

‎src/StructureMap.DynamicInterception/paket.references

-1
This file was deleted.

‎src/StructureMap.DynamicInterception/project.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"version": "1.0.0-*",
3+
"title": "StructureMap.DynamicInterception",
4+
"dependencies": {
5+
"Castle.Core": "4.0.0-beta001",
6+
"StructureMap": "4.3.0"
7+
},
8+
"frameworks": {
9+
"net45": {
10+
"dependencies": {
11+
}
12+
},
13+
"netstandard1.3": {
14+
"dependencies": {
15+
"System.Collections.Concurrent": "4.0.12",
16+
"System.Reflection.TypeExtensions": "4.1.0",
17+
"NETStandard.Library": "1.6.0"
18+
}
19+
}
20+
}
21+
}

‎src/global.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"projects": [
3+
"StructureMap.DynamicInterception",
4+
"StructureMap.DynamicInterception.Testing"
5+
]
6+
}

0 commit comments

Comments
 (0)
Please sign in to comment.