Skip to content

Commit 3eb9e2a

Browse files
nivalxernivalxer
authored
Update Build Target (#329)
* Update Build Target * Add .net9 target.
1 parent ad7004e commit 3eb9e2a

28 files changed

Lines changed: 314 additions & 176 deletions

File tree

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

Lines changed: 3 additions & 3 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>net8.0;net7.0;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -14,12 +14,12 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
17+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1818
</ItemGroup>
1919

2020

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

2525
<ItemGroup>

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

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

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

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1313
</ItemGroup>
1414

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

1919
<ItemGroup>

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

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

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

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1313
</ItemGroup>
1414

1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
55
<PublishRepositoryUrl>true</PublishRepositoryUrl>
66
<IncludeSymbols>true</IncludeSymbols>
77
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

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

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\common.props" />
4-
5-
<PropertyGroup>
6-
<Description>The abstract design of the AspectCore framework.</Description>
7-
<AssemblyTitle>AspectCore.Abstractions</AssemblyTitle>
8-
<AssemblyName>AspectCore.Abstractions</AssemblyName>
9-
<PackageId>AspectCore.Abstractions</PackageId>
10-
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Interceptor</PackageTags>
11-
<PackageReleaseNotes>The abstract design of the AspectCore framework.</PackageReleaseNotes>
12-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
13-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
14-
<IncludeSymbols>true</IncludeSymbols>
15-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16-
</PropertyGroup>
3+
<Import Project="..\..\build\common.props" />
4+
5+
<PropertyGroup>
6+
<Description>The abstract design of the AspectCore framework.</Description>
7+
<AssemblyTitle>AspectCore.Abstractions</AssemblyTitle>
8+
<AssemblyName>AspectCore.Abstractions</AssemblyName>
9+
<PackageId>AspectCore.Abstractions</PackageId>
10+
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Interceptor</PackageTags>
11+
<PackageReleaseNotes>The abstract design of the AspectCore framework.</PackageReleaseNotes>
12+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
13+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16+
</PropertyGroup>
17+
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
19+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
20+
</ItemGroup>
1721

1822
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
1923
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
@@ -26,13 +30,17 @@
2630
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
2731
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
2832
</ItemGroup>
29-
30-
<ItemGroup>
31-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
32-
</ItemGroup>
33-
34-
<ItemGroup>
35-
<Folder Include="Properties\" />
36-
</ItemGroup>
37-
38-
</Project>
33+
34+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
35+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<Folder Include="Properties\" />
44+
</ItemGroup>
45+
46+
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
using System;
22
using AspectCore.DynamicProxy;
3-
using Microsoft.Extensions.DependencyInjection;
43

54
namespace AspectCore.DependencyInjection
65
{
76
[NonAspect]
87
public interface IServiceResolver : IServiceProvider, IDisposable
98
#if NET8_0_OR_GREATER
10-
, IKeyedServiceProvider
9+
, Microsoft.Extensions.DependencyInjection.IKeyedServiceProvider
1110
#endif
1211
{
1312
object Resolve(Type serviceType);

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@
88
<PackageId>AspectCore.Core</PackageId>
99
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Interceptor</PackageTags>
1010
<PackageReleaseNotes>The implementation of the AspectCore framework.</PackageReleaseNotes>
11-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
11+
<TargetFrameworks>.net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
1212
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1313
<IncludeSymbols>true</IncludeSymbols>
1414
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
18+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
2222
<ProjectReference Include="..\AspectCore.Abstractions\AspectCore.Abstractions.csproj" />
2323
<ProjectReference Include="..\AspectCore.Extensions.Reflection\AspectCore.Extensions.Reflection.csproj" />
2424
</ItemGroup>
2525

26+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
27+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
28+
</ItemGroup>
29+
2630
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<IncludeSymbols>true</IncludeSymbols>
99
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
1313
<FrameworkReference Include="Microsoft.AspNetCore.App" />
14-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
14+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
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>net8.0;net7.0;net6.0</TargetFrameworks>
13+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
1414
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1515
<IncludeSymbols>true</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
20+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<PackageId>AspectCore.Extensions.Autofac</PackageId>
1010
<PackageTags>DynamicProxy;Aop;Autofac;AspectCore</PackageTags>
1111
<PackageReleaseNotes>Interceptor and dynamicProxy support for Autofac via AspectCore Framework.</PackageReleaseNotes>
12-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
12+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
2020
</ItemGroup>
2121

2222

0 commit comments

Comments
 (0)