Skip to content

Commit 0722175

Browse files
nivalxerliuhaoyang
nivalxer
and
liuhaoyang
authored
add .NET6 target (#280)
* add .net6 target * fix some target .net6 test error Co-authored-by: Liu Haoyang <liuhaoyang1221@hotmail.com>
1 parent e87c063 commit 0722175

26 files changed

Lines changed: 219 additions & 189 deletions

File tree

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '{build}'
2-
os: Visual Studio 2019
2+
os: Visual Studio 2022
33
branches:
44
only:
55
- master

‎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>net5.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

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

2020

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

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
6-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
7-
<IncludeSymbols>true</IncludeSymbols>
8-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
6+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
7+
<IncludeSymbols>true</IncludeSymbols>
8+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
9+
</PropertyGroup>
1010

11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
13-
</ItemGroup>
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
13+
</ItemGroup>
1414

15+
<ItemGroup>
16+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
17+
</ItemGroup>
1518

16-
<ItemGroup>
17-
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<ProjectReference Include="..\..\src\AspectCore.Extensions.Reflection\AspectCore.Extensions.Reflection.csproj" />
22-
</ItemGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="..\..\src\AspectCore.Extensions.Reflection\AspectCore.Extensions.Reflection.csproj" />
21+
</ItemGroup>
2322

2423
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</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.0.0" PrivateAssets="All" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" 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>net5.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</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.0.0" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
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>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
12+
<TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0;net461</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.0.0" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2020
</ItemGroup>
2121

2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<PackageId>AspectCore.Core</PackageId>
99
<PackageTags>DynamicProxy;Aop;Aspect;AspectCore;Interceptor</PackageTags>
1010
<PackageReleaseNotes>The implementation of the AspectCore framework.</PackageReleaseNotes>
11-
<TargetFrameworks>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
11+
<TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0;net461</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.0.0" PrivateAssets="All" />
18+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎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>net5.0;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</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.0.0" PrivateAssets="All" />
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: 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>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
13+
<TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0;net461</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.0.0" PrivateAssets="All" />
20+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2121
</ItemGroup>
2222

2323

‎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>net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
12+
<TargetFrameworks>net6.0;net5.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.0.0" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2020
</ItemGroup>
2121

2222

0 commit comments

Comments
 (0)