Skip to content

Commit 2de0b59

Browse files
nivalxernivalxer
authored
Add .NET8 target (#318)
* add .net8 target Signed-off-by: nivalxer <[email protected]> * 移除以下目标： .NETStandard 2.0 .NETStandard 2.1 .NET5 .NET461
1 parent dfd5cf6 commit 2de0b59

File tree

36 files changed

+350
-125
lines changed

36 files changed

+350
-125
lines changed

‎benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\sign.props" />
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -19,7 +19,7 @@
1919

2020

2121
<ItemGroup>
22-
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
22+
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
16+
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

‎sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
55
<PublishRepositoryUrl>true</PublishRepositoryUrl>
66
<IncludeSymbols>true</IncludeSymbols>
77
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

‎src/AspectCore.Abstractions/AspectCore.Abstractions.csproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,30 @@
99
<PackageId>AspectCore.Abstractions</PackageId>
1010
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Interceptor</PackageTags>
1111
<PackageReleaseNotes>The abstract design of the AspectCore framework.</PackageReleaseNotes>
12-
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
12+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1616
</PropertyGroup>
1717

18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
20+
</ItemGroup>
21+
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
23+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
28+
</ItemGroup>
29+
1830
<ItemGroup>
1931
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2032
</ItemGroup>
2133

22-
2334
<ItemGroup>
2435
<Folder Include="Properties\" />
2536
</ItemGroup>
26-
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' ">
28-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
29-
</ItemGroup>
3037

3138
</Project>

‎src/AspectCore.Abstractions/DependencyInjection/IServiceResolver.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
using System;
22
using AspectCore.DynamicProxy;
3+
using Microsoft.Extensions.DependencyInjection;
34

45
namespace AspectCore.DependencyInjection
56
{
67
[NonAspect]
78
public interface IServiceResolver : IServiceProvider, IDisposable
9+
#if NET8_0_OR_GREATER
10+
, IKeyedServiceProvider
11+
#endif
812
{
913
object Resolve(Type serviceType);
1014
}

‎src/AspectCore.Core/AspectCore.Core.csproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageId>AspectCore.Core</PackageId>
99
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Interceptor</PackageTags>
1010
<PackageReleaseNotes>The implementation of the AspectCore framework.</PackageReleaseNotes>
11-
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
11+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
1212
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1313
<IncludeSymbols>true</IncludeSymbols>
1414
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -23,10 +23,4 @@
2323
<ProjectReference Include="..\AspectCore.Extensions.Reflection\AspectCore.Extensions.Reflection.csproj" />
2424
</ItemGroup>
2525

26-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' ">
27-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
28-
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
29-
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
30-
</ItemGroup>
31-
3226
</Project>

‎src/AspectCore.Core/DependencyInjection/ServiceResolver.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ internal object ResolveDefinition(ServiceDefinition definition)
7272
}
7373
}
7474

75+
#if NET8_0_OR_GREATER
76+
public object GetKeyedService(Type serviceType, object serviceKey)
77+
{
78+
throw new NotImplementedException();
79+
}
80+
81+
public object GetRequiredKeyedService(Type serviceType, object serviceKey)
82+
{
83+
throw new NotImplementedException();
84+
}
85+
#endif
86+
7587
#region IDisposable Support
7688
private bool disposedValue = false;
7789

‎src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<IncludeSymbols>true</IncludeSymbols>
99
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

‎src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Title>AspectCore.Extensions.AspectScope</Title>
1111
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Intercepter</PackageTags>
1212
<PackageReleaseNotes>ScopedContext extension system for AspectCore Framework.</PackageReleaseNotes>
13-
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
13+
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
1414
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1515
<IncludeSymbols>true</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -20,7 +20,6 @@
2020
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2121
</ItemGroup>
2222

23-
2423
<ItemGroup>
2524
<ProjectReference Include="..\AspectCore.Core\AspectCore.Core.csproj" />
2625
</ItemGroup>

0 commit comments

Comments
 (0)