Skip to content

Commit 29a2bc6

Browse files
JeffreySuJeffreySu
authored
Merge pull request #320 from Senparc/Develop
CO2NET v3.1.0 正式版发布
2 parents cd93158 + 3e10b3a commit 29a2bc6

File tree

13 files changed

+646
-646
lines changed

13 files changed

+646
-646
lines changed

‎Sample/Senparc.CO2NET.Sample.Consoles/Program.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ and limitations under the License.
5757
var senparcSetting = new SenparcSetting();
5858
config.GetSection("SenparcSetting").Bind(senparcSetting);
5959

60-
6160
var services = new ServiceCollection();
6261
services.AddMemoryCache();//使用本地缓存必须添加
6362

‎src/Senparc.CO2NET.APM/Senparc.CO2NET.APM.csproj‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4-
<Version>2.1.0-beta1</Version>
5-
<AssemblyName>Senparc.CO2NET.APM</AssemblyName>
6-
<RootNamespace>Senparc.CO2NET.APM</RootNamespace>
7-
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
8-
<Description>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4+
<Version>2.1.0</Version>
5+
<AssemblyName>Senparc.CO2NET.APM</AssemblyName>
6+
<RootNamespace>Senparc.CO2NET.APM</RootNamespace>
7+
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
8+
<Description>
99
Senparc.CO2NET.APM Application Performance Management
1010
</Description>
11-
<Copyright>Senparc Copyright © 2004~2024</Copyright>
12-
<PackageTags>APM,.NET Core,.NET Framework,Public,Base Library,CO2NET,盛派</PackageTags>
13-
<Authors>Senparc</Authors>
14-
<Owners>Senparc</Owners>
15-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16-
<ProjectUrl>https://github.com/Senparc/Senparc.CO2NET</ProjectUrl>
17-
<Title>Senparc.CO2NET.APM.dll</Title>
18-
<Summary>Senparc.CO2NET.APM</Summary>
19-
<PackageProjectUrl>https://github.com/Senparc/Senparc.CO2NET</PackageProjectUrl>
20-
<PackageIcon>icon.jpg</PackageIcon>
21-
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
22-
<Configurations>Debug;Release;Test</Configurations>
23-
<PackageReleaseNotes>
11+
<Copyright>Senparc Copyright © 2004~2024</Copyright>
12+
<PackageTags>APM,.NET Core,.NET Framework,Public,Base Library,CO2NET,盛派</PackageTags>
13+
<Authors>Senparc</Authors>
14+
<Owners>Senparc</Owners>
15+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16+
<ProjectUrl>https://github.com/Senparc/Senparc.CO2NET</ProjectUrl>
17+
<Title>Senparc.CO2NET.APM.dll</Title>
18+
<Summary>Senparc.CO2NET.APM</Summary>
19+
<PackageProjectUrl>https://github.com/Senparc/Senparc.CO2NET</PackageProjectUrl>
20+
<PackageIcon>icon.jpg</PackageIcon>
21+
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
22+
<Configurations>Debug;Release;Test</Configurations>
23+
<PackageReleaseNotes>
2424
v0.1.1 Supports basic monitoring data recording, retrieval, and organization/cleanup operations
2525
v0.1.2 DataItem provides TempStorage property; DataOperation supports global mode without domain distinction
2626
v0.1.3 Supports Senparc.CO2NET v0.3.0
@@ -39,32 +39,32 @@
3939
[2024-11-28] v2.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
4040
[2024-12-04] v2.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
4141
</PackageReleaseNotes>
42-
</PropertyGroup>
43-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
44-
<OutputPath>..\BuildOutPut</OutputPath>
45-
<DefineConstants>TRACE;RELEASE</DefineConstants>
46-
</PropertyGroup>
47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
48-
<OutputPath>..\BuildOutPut</OutputPath>
49-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
50-
<DocumentationFile>..\BuildOutPut\Senparc.CO2NET.APM.xml</DocumentationFile>
51-
<Optimize>true</Optimize>
52-
<DebugType>pdbonly</DebugType>
53-
<ErrorReport>prompt</ErrorReport>
54-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
57-
<OutputPath>..\BuildOutPut\</OutputPath>
58-
<DocumentationFile>..\BuildOutPut\net462\Senparc.CO2NET.APM.xml</DocumentationFile>
59-
</PropertyGroup>
60-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
61-
<OutputPath>..\BuildOutPut\</OutputPath>
62-
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.CO2NET.APM.xml</DocumentationFile>
63-
</PropertyGroup>
64-
<ItemGroup>
65-
<None Include="..\Senparc.CO2NET\icon.jpg" Pack="true" Visible="false" PackagePath="" />
66-
</ItemGroup>
67-
<ItemGroup>
68-
<ProjectReference Include="..\Senparc.CO2NET\Senparc.CO2NET.csproj" />
69-
</ItemGroup>
42+
</PropertyGroup>
43+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
44+
<OutputPath>..\BuildOutPut</OutputPath>
45+
<DefineConstants>TRACE;RELEASE</DefineConstants>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
48+
<OutputPath>..\BuildOutPut</OutputPath>
49+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
50+
<DocumentationFile>..\BuildOutPut\Senparc.CO2NET.APM.xml</DocumentationFile>
51+
<Optimize>true</Optimize>
52+
<DebugType>pdbonly</DebugType>
53+
<ErrorReport>prompt</ErrorReport>
54+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
57+
<OutputPath>..\BuildOutPut\</OutputPath>
58+
<DocumentationFile>..\BuildOutPut\net462\Senparc.CO2NET.APM.xml</DocumentationFile>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
61+
<OutputPath>..\BuildOutPut\</OutputPath>
62+
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.CO2NET.APM.xml</DocumentationFile>
63+
</PropertyGroup>
64+
<ItemGroup>
65+
<None Include="..\Senparc.CO2NET\icon.jpg" Pack="true" Visible="false" PackagePath="" />
66+
</ItemGroup>
67+
<ItemGroup>
68+
<ProjectReference Include="..\Senparc.CO2NET\Senparc.CO2NET.csproj" />
69+
</ItemGroup>
7070
</Project>

‎src/Senparc.CO2NET.AspNet/Senparc.CO2NET.AspNet.csproj‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
4-
<Version>2.1.0-beta1</Version>
5-
<AssemblyName>Senparc.CO2NET.AspNet</AssemblyName>
6-
<RootNamespace>Senparc.CO2NET.AspNet</RootNamespace>
7-
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
8-
<Description>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
4+
<Version>2.1.0</Version>
5+
<AssemblyName>Senparc.CO2NET.AspNet</AssemblyName>
6+
<RootNamespace>Senparc.CO2NET.AspNet</RootNamespace>
7+
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
8+
<Description>
99
Senparc.CO2NET.AspNet library
1010

1111
Senparc.CO2NET open source project:
1212
https://github.com/Senparc/Senparc.CO2NET
1313
</Description>
14-
<Copyright>Senparc Copyright © 2004~2024</Copyright>
15-
<PackageTags>.NET Core,.NET Framework,public,base library,CO2NET,ASP.NET</PackageTags>
16-
<Authors>Senparc</Authors>
17-
<Owners>Senparc</Owners>
18-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
19-
<ProjectUrl>https://github.com/Senparc/Senparc.CO2NET</ProjectUrl>
20-
<Title>Senparc.CO2NET.dll</Title>
21-
<Summary>Senparc.CO2NET.AspNet library</Summary>
22-
<PackageProjectUrl>https://github.com/Senparc/Senparc.CO2NET</PackageProjectUrl>
23-
<PackageIcon>icon.jpg</PackageIcon>
24-
<PackageReleaseNotes>
14+
<Copyright>Senparc Copyright © 2004~2024</Copyright>
15+
<PackageTags>.NET Core,.NET Framework,public,base library,CO2NET,ASP.NET</PackageTags>
16+
<Authors>Senparc</Authors>
17+
<Owners>Senparc</Owners>
18+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
19+
<ProjectUrl>https://github.com/Senparc/Senparc.CO2NET</ProjectUrl>
20+
<Title>Senparc.CO2NET.dll</Title>
21+
<Summary>Senparc.CO2NET.AspNet library</Summary>
22+
<PackageProjectUrl>https://github.com/Senparc/Senparc.CO2NET</PackageProjectUrl>
23+
<PackageIcon>icon.jpg</PackageIcon>
24+
<PackageReleaseNotes>
2525
v0.1.0 Build basic code, separate ASP.NET (and ASP.NET Core) code from Senparc.CO2NET
2626
v0.4.300.4 Provide GetRequestMemoryStreamAsync() async method
2727
v1.0.1 Update UseSenparcGlobal parameter input method
@@ -35,64 +35,64 @@
3535
[2024-11-28] v2.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
3636
[2024-12-04] v2.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
3737
</PackageReleaseNotes>
38-
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
39-
<Configurations>Debug;Release;Test</Configurations>
40-
</PropertyGroup>
41-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
42-
<OutputPath>..\BuildOutPut</OutputPath>
43-
<DefineConstants>TRACE;RELEASE</DefineConstants>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
46-
<OutputPath>..\BuildOutPut</OutputPath>
47-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
48-
<DocumentationFile>..\BuildOutPut\Senparc.CO2NET.AspNet.xml</DocumentationFile>
49-
<Optimize>true</Optimize>
50-
<DebugType>pdbonly</DebugType>
51-
<ErrorReport>prompt</ErrorReport>
52-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
53-
</PropertyGroup>
54-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
55-
<OutputPath>..\BuildOutPut\</OutputPath>
56-
<DocumentationFile>..\BuildOutPut\net462\Senparc.CO2NET.AspNet..xml</DocumentationFile>
57-
</PropertyGroup>
58-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
59-
<OutputPath>..\BuildOutPut\</OutputPath>
60-
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.CO2NET.AspNet.xml</DocumentationFile>
61-
</PropertyGroup>
62-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
63-
<OutputPath>..\BuildOutPut\</OutputPath>
64-
<DocumentationFile>..\BuildOutPut\netstandard2.1\Senparc.CO2NET.AspNet.xml</DocumentationFile>
65-
</PropertyGroup>
66-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
67-
<OutputPath>..\BuildOutPut\</OutputPath>
68-
<DocumentationFile>..\BuildOutPut\net8.0\Senparc.CO2NET.AspNet.xml</DocumentationFile>
69-
</PropertyGroup>
70-
<ItemGroup>
71-
<None Include="..\Senparc.CO2NET\icon.jpg" Pack="true" Visible="false" PackagePath="" />
72-
</ItemGroup>
73-
<ItemGroup>
74-
<ProjectReference Include="..\Senparc.CO2NET\Senparc.CO2NET.csproj" />
75-
<PackageReference Include="Microsoft.Extensions.Hosting">
76-
<Version>8.0.0</Version>
77-
</PackageReference>
78-
</ItemGroup>
79-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
80-
<Reference Include="System.Web" />
81-
<Reference Include="System.Web.Extensions" />
82-
</ItemGroup>
83-
<!--<ItemGroup Condition="'$(TargetFramework)' != 'net462' ">
38+
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
39+
<Configurations>Debug;Release;Test</Configurations>
40+
</PropertyGroup>
41+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
42+
<OutputPath>..\BuildOutPut</OutputPath>
43+
<DefineConstants>TRACE;RELEASE</DefineConstants>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
46+
<OutputPath>..\BuildOutPut</OutputPath>
47+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
48+
<DocumentationFile>..\BuildOutPut\Senparc.CO2NET.AspNet.xml</DocumentationFile>
49+
<Optimize>true</Optimize>
50+
<DebugType>pdbonly</DebugType>
51+
<ErrorReport>prompt</ErrorReport>
52+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
55+
<OutputPath>..\BuildOutPut\</OutputPath>
56+
<DocumentationFile>..\BuildOutPut\net462\Senparc.CO2NET.AspNet..xml</DocumentationFile>
57+
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
59+
<OutputPath>..\BuildOutPut\</OutputPath>
60+
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.CO2NET.AspNet.xml</DocumentationFile>
61+
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
63+
<OutputPath>..\BuildOutPut\</OutputPath>
64+
<DocumentationFile>..\BuildOutPut\netstandard2.1\Senparc.CO2NET.AspNet.xml</DocumentationFile>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
67+
<OutputPath>..\BuildOutPut\</OutputPath>
68+
<DocumentationFile>..\BuildOutPut\net8.0\Senparc.CO2NET.AspNet.xml</DocumentationFile>
69+
</PropertyGroup>
70+
<ItemGroup>
71+
<None Include="..\Senparc.CO2NET\icon.jpg" Pack="true" Visible="false" PackagePath="" />
72+
</ItemGroup>
73+
<ItemGroup>
74+
<ProjectReference Include="..\Senparc.CO2NET\Senparc.CO2NET.csproj" />
75+
<PackageReference Include="Microsoft.Extensions.Hosting">
76+
<Version>8.0.0</Version>
77+
</PackageReference>
78+
</ItemGroup>
79+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
80+
<Reference Include="System.Web" />
81+
<Reference Include="System.Web.Extensions" />
82+
</ItemGroup>
83+
<!--<ItemGroup Condition="'$(TargetFramework)' != 'net462' ">
8484
8585
</ItemGroup>-->
86-
<!--<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0') OR ('$(TargetFramework)' == 'netstandard2.1')">-->
87-
<ItemGroup Condition="'$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net8.0'">
88-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
89-
<Version>2.2.0</Version>
90-
</PackageReference>
91-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
92-
<Version>2.2.0</Version>
93-
</PackageReference>
94-
</ItemGroup>
95-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
96-
<PackageReference Include="Microsoft.AspNetCore.App" />
97-
</ItemGroup>
86+
<!--<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0') OR ('$(TargetFramework)' == 'netstandard2.1')">-->
87+
<ItemGroup Condition="'$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net8.0'">
88+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
89+
<Version>2.2.0</Version>
90+
</PackageReference>
91+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
92+
<Version>2.2.0</Version>
93+
</PackageReference>
94+
</ItemGroup>
95+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
96+
<PackageReference Include="Microsoft.AspNetCore.App" />
97+
</ItemGroup>
9898
</Project>

‎src/Senparc.CO2NET.Cache.CsRedis.RedLock/redlock-cs/src/Senparc.CO2NET.Cache.CsRedis.RedLock.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
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4-
<Version>2.1.0-beta1</Version>
4+
<Version>2.1.0</Version>
55
<AssemblyName>Senparc.CO2NET.Cache.CsRedis.RedLock</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.Cache.CsRedis.RedLock</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

0 commit comments

Comments
 (0)