support .NET Framework 4.5 (#129)

dotnetcore · Jun 23, 2018 · 08d1273 · 08d1273
1 parent 6ad269d
commit 08d1273
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 23 deletions.
diff --git a/aspectscope/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj b/aspectscope/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj
@@ -10,6 +10,7 @@
     <Title>AspectCore.Extensions.AspectScope</Title>
     <PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Intercepter</PackageTags>
     <PackageReleaseNotes>ScopedContext extension system for AspectCore Framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/build/common.props b/build/common.props
@@ -13,7 +13,6 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>  
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 </Project>
diff --git a/build/version.props b/build/version.props
@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<VersionMajor>0</VersionMajor>
-		<VersionMinor>6</VersionMinor>
+		<VersionMinor>7</VersionMinor>
 		<VersionPatch>0</VersionPatch>
 		<VersionQuality></VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

diff --git a/core/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj b/core/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj
@@ -9,6 +9,7 @@
     <PackageId>AspectCore.Abstractions</PackageId>
     <PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Intercepter</PackageTags>
     <PackageReleaseNotes>The abstract design of the AspectCore framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/core/src/AspectCore.Core/AspectCore.Core.csproj b/core/src/AspectCore.Core/AspectCore.Core.csproj
@@ -8,6 +8,7 @@
     <PackageId>AspectCore.Core</PackageId>
     <PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Intercepter</PackageTags>
     <PackageReleaseNotes>The implementation of the AspectCore framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0-rc1" />

diff --git a/...on/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj b/...on/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj
@@ -9,6 +9,7 @@
     <PackageId>AspectCore.Extensions.DataAnnotations</PackageId>
     <PackageTags>DataValidation;DataAnnotations;AspectCore;AOP</PackageTags>
     <PackageReleaseNotes>DataAnnotations extension system for AspectCore Framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...tion/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj b/...tion/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj
@@ -9,6 +9,7 @@
     <PackageId>AspectCore.Extensions.DataValidation</PackageId>
     <PackageTags>DataValidation;AspectCore;AOP</PackageTags>
     <PackageReleaseNotes>DataValidation extension system for AspectCore Framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/extras/AspectCore.Extras.sln b/extras/AspectCore.Extras.sln
@@ -35,12 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.Autof
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.Windsor.Test", "test\AspectCore.Extensions.Windsor.Test\AspectCore.Extensions.Windsor.Test.csproj", "{990CD172-3266-42D3-AE8D-579C2175B854}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.AspNetCore", "src\AspectCore.Extensions.AspNetCore\AspectCore.Extensions.AspNetCore.csproj", "{873B47CD-D4A6-4883-9833-3F5B75093BD2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.AspectScope", "..\aspectscope\src\AspectCore.Extensions.AspectScope\AspectCore.Extensions.AspectScope.csproj", "{BE96583B-176A-438A-B6A5-F976CC374078}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.AspNetCore.Sample", "sample\AspectCore.Extensions.AspNetCore.Sample\AspectCore.Extensions.AspNetCore.Sample.csproj", "{643FDBC1-7BE9-45BC-ABBC-4208F79ADF6A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.DataValidation", "..\datavalidation\src\AspectCore.Extensions.DataValidation\AspectCore.Extensions.DataValidation.csproj", "{D3199A7B-E0E2-491A-A105-7ACF1E15A896}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspectCore.Extensions.DataAnnotations", "..\datavalidation\src\AspectCore.Extensions.DataAnnotations\AspectCore.Extensions.DataAnnotations.csproj", "{C58CDC63-4DFA-42DB-BCB1-CAC220EAED04}"
@@ -105,18 +101,10 @@ Global
 		{990CD172-3266-42D3-AE8D-579C2175B854}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{990CD172-3266-42D3-AE8D-579C2175B854}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{990CD172-3266-42D3-AE8D-579C2175B854}.Release|Any CPU.Build.0 = Release|Any CPU
-		{873B47CD-D4A6-4883-9833-3F5B75093BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{873B47CD-D4A6-4883-9833-3F5B75093BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{873B47CD-D4A6-4883-9833-3F5B75093BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{873B47CD-D4A6-4883-9833-3F5B75093BD2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE96583B-176A-438A-B6A5-F976CC374078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BE96583B-176A-438A-B6A5-F976CC374078}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BE96583B-176A-438A-B6A5-F976CC374078}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE96583B-176A-438A-B6A5-F976CC374078}.Release|Any CPU.Build.0 = Release|Any CPU
-		{643FDBC1-7BE9-45BC-ABBC-4208F79ADF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{643FDBC1-7BE9-45BC-ABBC-4208F79ADF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{643FDBC1-7BE9-45BC-ABBC-4208F79ADF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{643FDBC1-7BE9-45BC-ABBC-4208F79ADF6A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3199A7B-E0E2-491A-A105-7ACF1E15A896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3199A7B-E0E2-491A-A105-7ACF1E15A896}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3199A7B-E0E2-491A-A105-7ACF1E15A896}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -154,9 +142,7 @@ Global
 		{CA6F52CA-3B0E-416D-9A96-9962385542CB} = {EF35FB72-D934-45A8-9856-E60EA2623135}
 		{8453B7FA-B465-4367-A6EB-EF21F4F22914} = {E933A059-A6AC-46AC-928D-33656D7FE93A}
 		{990CD172-3266-42D3-AE8D-579C2175B854} = {BA3DCC4B-D8B9-4761-AAD9-4B1363140049}
-		{873B47CD-D4A6-4883-9833-3F5B75093BD2} = {EF35FB72-D934-45A8-9856-E60EA2623135}
 		{BE96583B-176A-438A-B6A5-F976CC374078} = {FA9E353F-695D-49FC-A0CA-654829134AB5}
-		{643FDBC1-7BE9-45BC-ABBC-4208F79ADF6A} = {E933A059-A6AC-46AC-928D-33656D7FE93A}
 		{D3199A7B-E0E2-491A-A105-7ACF1E15A896} = {FA9E353F-695D-49FC-A0CA-654829134AB5}
 		{C58CDC63-4DFA-42DB-BCB1-CAC220EAED04} = {FA9E353F-695D-49FC-A0CA-654829134AB5}
 		{EBCFF74A-4787-4A3E-A83D-0DC0329CFD2E} = {E933A059-A6AC-46AC-928D-33656D7FE93A}

diff --git a/extras/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj b/extras/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\..\build\common.props" />
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
@@ -15,10 +17,4 @@
     <ProjectReference Include="..\AspectCore.Extensions.DependencyInjection\AspectCore.Extensions.DependencyInjection.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore.Http.Abstractions">
-      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.http.abstractions\2.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/extras/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj b/extras/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj
@@ -9,6 +9,7 @@
     <PackageId>AspectCore.Extensions.Autofac</PackageId>
     <PackageTags>DynamicProxy;Aop;Autofac;AspectCore</PackageTags>
     <PackageReleaseNotes>Interceptor and dynamicProxy support for Autofac via AspectCore Framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...spectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj b/...spectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj
@@ -10,6 +10,7 @@
     <PackageTags>DynamicProxy;Aop;DependencyInjection;AspectCore</PackageTags>
     <PackageReleaseNotes>Interceptor and dynamicProxy support for Microsoft.Extensions.DependencyInjection via AspectCore Framework.</PackageReleaseNotes>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />

diff --git a/extras/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj b/extras/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\build\common.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>

diff --git a/extras/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj b/extras/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj
@@ -9,6 +9,7 @@
     <PackageId>AspectCore.Extensions.Windsor</PackageId>
     <PackageTags>DynamicProxy;Aop;Windsor;AspectCore</PackageTags>
     <PackageReleaseNotes>Interceptor and dynamicProxy support for Castle.Windsor via AspectCore Framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/reflection/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj b/reflection/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj
@@ -8,6 +8,7 @@
     <PackageId>AspectCore.Extensions.Reflection</PackageId>
     <PackageTags>Reflection;Aop;DynamicProxy</PackageTags>
     <PackageReleaseNotes>Reflection extension system for AspectCore Framework.</PackageReleaseNotes>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />