Skip to content

Commit ca3f365

Browse files
554393109554393109
authored
Merge branch 'Develop' into Develop
2 parents 88a2679 + ed690f3 commit ca3f365

File tree

166 files changed

+48409
-1010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+48409
-1010
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ obj/*
3131
/src/Senparc.CO2NET.Cache.Redis.Tests - Copy/App_Data/SenparcTraceLog
3232
/src/Senparc.CO2NET.Cache.CsRedis.Tests/App_Data/SenparcTraceLog/*
3333
/Sample/Senparc.CO2NET.Sample.net6/App_Data/SenparcTraceLog
34+
/src/Senparc.CO2NET.WebApi.Tests/App_Data/SenparcTraceLog
35+
/Sample/Senparc.CO2NET.Sample.net6/App_Data/ApiDocXml/Senparc.DynamicWebApi.WeChat_OfficialAccount.xml
36+
/src/Senparc.CO2NET.WebApi.Tests/App_Data/ApiDocXml/Senparc.DynamicWebApi.WeChat_OfficialAccount.xml
37+
/Sample/Senparc.CO2NET.Sample.net6/App_Data/ApiDocXml/Senparc.CO2NET.Sample.xml
38+
/Sample/Senparc.CO2NET.Sample.net6/App_Data/ApiDocXml/DynamicFiles

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
| APM 模块 | Senparc.CO2NET.APM | [![Senparc.CO2NET.APM][2.1]][2.2] [![Senparc.CO2NET.APM][nuget-img-base-apm]][nuget-url-base-apm] | ![.NET 3.5][net35Y] ![.NET 4.0][net40Y] ![.NET 4.5][net45Y] ![.NET Core 2.0][core20Y]
1212
| Redis 基础库 | Senparc.CO2NET.Cache.Redis | [![Senparc.CO2NET.Cache.Redis][3.1]][3.2] [![Senparc.CO2NET.Cache.Redis][nuget-img-base-redis]][nuget-url-base-redis] | ![.NET 3.5][net35N] ![.NET 4.0][net40N] ![.NET 4.5][net45Y] ![.NET Core 2.0][core20Y]
1313
| Memcached 基础库 | Senparc.CO2NET.Cache.Memcached | [![Senparc.CO2NET.Cache.Memcached][4.1]][4.2] [![Senparc.CO2NET.Cache.Memcached][nuget-img-base-memcached]][nuget-url-base-memcached] | ![.NET 3.5][net35N] ![.NET 4.0][net40N] ![.NET 4.5][net45Y] ![.NET Core 2.0][core20Y]
14+
| WebApi（新） | Senparc.CO2NET.WebApi | [![Senparc.CO2NET.WebApi][5.1]][5.2] [![Senparc.CO2NET.Cache.Memcached][nuget-img-base-memcached]][nuget-url-base-memcached] | ![.NET 3.5][net35N] ![.NET 4.0][net40N] ![.NET 4.5][net45Y] ![.NET Core 2.0][core20Y]
1415

15-
![.NET Core 2.0][core20Y] 同时支持 .NET Standard 2.0+ 及 .NET Core 2.2+
16+
![.NET Core 2.0][core20Y] 同时支持 .NET Standard 2.0+ 及 .NET Core 2.1/3.1、.NET 5.0/6.0
1617

1718
> CO2NET 将逐步停止对 .NET Framework 4.0 及以下版本的支持。
1819
@@ -24,6 +25,9 @@
2425
[3.2]: https://www.nuget.org/packages/Senparc.CO2NET.Cache.Redis
2526
[4.1]: https://img.shields.io/nuget/v/Senparc.CO2NET.Cache.Memcached.svg?style=flat
2627
[4.2]: https://www.nuget.org/packages/Senparc.CO2NET.Cache.Memcached
28+
[5.1]: https://img.shields.io/nuget/v/Senparc.CO2NET.WebApi.svg?style=flat
29+
[5.2]: https://www.nuget.org/packages/Senparc.CO2NET.WebApi
30+
2731

2832
[net35Y]: https://img.shields.io/badge/3.5-Y-brightgreen.svg
2933
[net35N]: https://img.shields.io/badge/3.5-N-lightgrey.svg
@@ -38,8 +42,8 @@
3842
[coreY]: https://img.shields.io/badge/standard2.0-Y-brightgreen.svg
3943
[coreN]: https://img.shields.io/badge/standard2.0-N-lightgrey.svg
4044
[coreN-]: https://img.shields.io/badge/standard2.0----lightgrey.svg
41-
[core20Y]: https://img.shields.io/badge/standard2.0-Y-brightgreen.svg
42-
[core20N]: https://img.shields.io/badge/standard2.0-N-lightgrey.svg
45+
[core20Y]: https://img.shields.io/badge/standard2.0+-Y-brightgreen.svg
46+
[core20N]: https://img.shields.io/badge/standard2.0+-N-lightgrey.svg
4347

4448
[nuget-img-base]: https://img.shields.io/nuget/dt/Senparc.CO2NET.svg
4549
[nuget-url-base]: https://www.nuget.org/packages/Senparc.CO2NET

‎Sample/Senparc.CO2NET.Sample-with-net6.sln‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29009.5
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31423.177
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET", "..\src\Senparc.CO2NET\Senparc.CO2NET.csproj", "{8B66B7FB-6918-4D21-9C31-98EACF3264C8}"
77
EndProject
@@ -32,9 +32,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.APM", "..\sr
3232
EndProject
3333
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.APM.Tests.net6", "..\src\Senparc.CO2NET.APM.Tests\Senparc.CO2NET.APM.Tests.net6.csproj", "{4FA6F2C4-54B5-469D-8ECF-0040120D3344}"
3434
EndProject
35-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.Sample.Consoles", "Senparc.CO2NET.Sample.Consoles\Senparc.CO2NET.Sample.Consoles.Net6.csproj", "{EF7278DE-7E6E-4F4F-AF19-BF7C6BA58F87}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.Sample.Consoles.Net6", "Senparc.CO2NET.Sample.Consoles\Senparc.CO2NET.Sample.Consoles.Net6.csproj", "{EF7278DE-7E6E-4F4F-AF19-BF7C6BA58F87}"
3636
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.Sample.netcore3", "Senparc.CO2NET.Sample.net6\Senparc.CO2NET.Sample.net6.csproj", "{84DE5542-70F9-4576-AF3E-6E8013338112}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.Sample.net6", "Senparc.CO2NET.Sample.net6\Senparc.CO2NET.Sample.net6.csproj", "{84DE5542-70F9-4576-AF3E-6E8013338112}"
3838
EndProject
3939
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.AspNet", "..\src\Senparc.CO2NET.AspNet\Senparc.CO2NET.AspNet.csproj", "{374C2921-C376-4D14-A88D-6DBC6FC53D8E}"
4040
EndProject
@@ -50,6 +50,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CsRedis", "CsRedis", "{DE30
5050
EndProject
5151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.Cache.CsRedis.Tests.net6", "..\src\Senparc.CO2NET.Cache.CsRedis.Tests\Senparc.CO2NET.Cache.CsRedis.Tests.net6.csproj", "{93DE8797-1F11-4963-9197-115C981A5196}"
5252
EndProject
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.WebApi", "..\src\Senparc.CO2NET.WebApi\Senparc.CO2NET.WebApi.csproj", "{DB5A5677-472C-4C21-AEB6-34C674C7997A}"
54+
EndProject
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.CO2NET.WebApi.Tests", "..\src\Senparc.CO2NET.WebApi.Tests\Senparc.CO2NET.WebApi.Tests.csproj", "{A81EF5EE-6B04-43FC-9284-1731FD7976B2}"
56+
EndProject
5357
Global
5458
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5559
Debug|Any CPU = Debug|Any CPU
@@ -142,6 +146,17 @@ Global
142146
{93DE8797-1F11-4963-9197-115C981A5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
143147
{93DE8797-1F11-4963-9197-115C981A5196}.Test|Any CPU.ActiveCfg = Test|Any CPU
144148
{93DE8797-1F11-4963-9197-115C981A5196}.Test|Any CPU.Build.0 = Test|Any CPU
149+
{DB5A5677-472C-4C21-AEB6-34C674C7997A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{DB5A5677-472C-4C21-AEB6-34C674C7997A}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{DB5A5677-472C-4C21-AEB6-34C674C7997A}.Release|Any CPU.ActiveCfg = Release|Any CPU
152+
{DB5A5677-472C-4C21-AEB6-34C674C7997A}.Release|Any CPU.Build.0 = Release|Any CPU
153+
{DB5A5677-472C-4C21-AEB6-34C674C7997A}.Test|Any CPU.ActiveCfg = Debug|Any CPU
154+
{DB5A5677-472C-4C21-AEB6-34C674C7997A}.Test|Any CPU.Build.0 = Debug|Any CPU
155+
{A81EF5EE-6B04-43FC-9284-1731FD7976B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
156+
{A81EF5EE-6B04-43FC-9284-1731FD7976B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
157+
{A81EF5EE-6B04-43FC-9284-1731FD7976B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
158+
{A81EF5EE-6B04-43FC-9284-1731FD7976B2}.Test|Any CPU.ActiveCfg = Debug|Any CPU
159+
{A81EF5EE-6B04-43FC-9284-1731FD7976B2}.Test|Any CPU.Build.0 = Debug|Any CPU
145160
EndGlobalSection
146161
GlobalSection(SolutionProperties) = preSolution
147162
HideSolutionNode = FALSE
@@ -166,6 +181,8 @@ Global
166181
{12AE45FC-1142-439C-9917-AC6FBDC22848} = {577DD010-AF7A-4113-9AEA-4BD6244D5318}
167182
{DE30C50A-9779-4906-8061-AD6A6C1F6796} = {577DD010-AF7A-4113-9AEA-4BD6244D5318}
168183
{93DE8797-1F11-4963-9197-115C981A5196} = {118ECC07-977C-42ED-A452-8934C8632261}
184+
{DB5A5677-472C-4C21-AEB6-34C674C7997A} = {FE9C797C-0788-451E-B04C-778484434ED5}
185+
{A81EF5EE-6B04-43FC-9284-1731FD7976B2} = {118ECC07-977C-42ED-A452-8934C8632261}
169186
EndGlobalSection
170187
GlobalSection(ExtensibilityGlobals) = postSolution
171188
SolutionGuid = {796B18F2-8DBB-4792-881F-4C5A81E1F2DB}

‎Sample/Senparc.CO2NET.Sample.Consoles/Senparc.CO2NET.Sample.Consoles.Net6.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.3.21201.4" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.3.21201.4" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.3.21201.4" />
25+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
2828
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
2929

30-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
30+
<!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->
3131

3232
</ItemGroup>
3333

0 commit comments

Comments
 (0)