Skip to content

Commit b1a06b5

Browse files
nivalxerliuhaoyang
nivalxer
and
liuhaoyang
authored
调整TargetFrameworks (#310)
* Change some TargetFrameworks * 兼容.net老版本的系统包 --------- Co-authored-by: Liu Haoyang <liuhaoyang1221@hotmail.com>
1 parent cddd616 commit b1a06b5

File tree

12 files changed

+27
-51
lines changed

12 files changed

+27
-51
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
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;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
12+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

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

Lines changed: 1 addition & 1 deletion
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;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
11+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
1212
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1313
<IncludeSymbols>true</IncludeSymbols>
1414
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

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

1717
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
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;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
13+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
1414
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1515
<IncludeSymbols>true</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
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>net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
12+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

‎src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,14 @@
88
<PackageId>AspectCore.Extensions.Configuration</PackageId>
99
<PackageTags>Reflection;Aop;DynamicProxy;Configuration</PackageTags>
1010
<PackageReleaseNotes>Configuration extension system for ASP.NET Core via AspectCore-Framework.</PackageReleaseNotes>
11-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
11+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
1212

1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
20-
</ItemGroup>
21-
22-
<ItemGroup>
23-
<ProjectReference Include="..\AspectCore.Abstractions\AspectCore.Abstractions.csproj" />
24-
<ProjectReference Include="..\AspectCore.Extensions.Reflection\AspectCore.Extensions.Reflection.csproj" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
33-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
3819
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
3920
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
4021
</ItemGroup>
@@ -49,4 +30,13 @@
4930
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
5031
</ItemGroup>
5132

33+
<ItemGroup>
34+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<ProjectReference Include="..\AspectCore.Abstractions\AspectCore.Abstractions.csproj" />
39+
<ProjectReference Include="..\AspectCore.Extensions.Reflection\AspectCore.Extensions.Reflection.csproj" />
40+
</ItemGroup>
41+
5242
</Project>

‎src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>AspectCore.Extensions.DataAnnotations</PackageId>
1010
<PackageTags>DataValidation;DataAnnotations;AspectCore;AOP</PackageTags>
1111
<PackageReleaseNotes>DataAnnotations extension system for AspectCore Framework.</PackageReleaseNotes>
12-
<TargetFrameworks>net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
12+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

‎src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>AspectCore.Extensions.DataValidation</PackageId>
1010
<PackageTags>DataValidation;AspectCore;AOP</PackageTags>
1111
<PackageReleaseNotes>DataValidation extension system for AspectCore Framework.</PackageReleaseNotes>
12-
<TargetFrameworks>net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
12+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
1313
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1414
<IncludeSymbols>true</IncludeSymbols>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

‎src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageTags>DynamicProxy;Aop;DependencyInjection;AspectCore</PackageTags>
1111
<PackageReleaseNotes>Interceptor and dynamicProxy support for Microsoft.Extensions.DependencyInjection via AspectCore Framework.</PackageReleaseNotes>
1212
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
13-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
13+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
1414
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1515
<IncludeSymbols>true</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -20,17 +20,8 @@
2020
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2121
</ItemGroup>
2222

23-
24-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
25-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
26-
</ItemGroup>
27-
28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
24+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
3425
</ItemGroup>
3526

3627
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">

‎src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
55
<PublishRepositoryUrl>true</PublishRepositoryUrl>
66
<IncludeSymbols>true</IncludeSymbols>
77
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -11,13 +11,8 @@
1111
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1212
</ItemGroup>
1313

14-
15-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
16-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
17-
</ItemGroup>
18-
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
20-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
14+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
15+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
2116
</ItemGroup>
2217

2318
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">

0 commit comments

Comments
 (0)