Skip to content

Commit 82a523d

Browse files
JeffreySuJeffreySu
authored
Merge pull request #332 from Senparc/Develop
Develop
2 parents b49e896 + 1f6d3a4 commit 82a523d

File tree

16 files changed

+139
-153
lines changed

16 files changed

+139
-153
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
2626
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2727
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
28-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
28+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.0" />
2929

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

‎src/Senparc.CO2NET.APM/Senparc.CO2NET.APM.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.1</Version>
4+
<Version>2.1.2</Version>
55
<AssemblyName>Senparc.CO2NET.APM</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.APM</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

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

Lines changed: 3 additions & 3 deletions
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;netstandard2.1;net8.0</TargetFrameworks>
4-
<Version>2.1.0.1</Version>
4+
<Version>2.1.1</Version>
55
<AssemblyName>Senparc.CO2NET.AspNet</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.AspNet</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -86,10 +86,10 @@
8686
<!--<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0') OR ('$(TargetFramework)' == 'netstandard2.1')">-->
8787
<ItemGroup Condition="'$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net8.0'">
8888
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
89-
<Version>2.2.0</Version>
89+
<Version>2.3.0</Version>
9090
</PackageReference>
9191
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
92-
<Version>2.2.0</Version>
92+
<Version>2.3.0</Version>
9393
</PackageReference>
9494
</ItemGroup>
9595
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

‎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.1</Version>
4+
<Version>2.1.1</Version>
55
<AssemblyName>Senparc.CO2NET.Cache.CsRedis.RedLock</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.Cache.CsRedis.RedLock</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

‎src/Senparc.CO2NET.Cache.CsRedis.Tests/Senparc.CO2NET.Cache.CsRedis.Tests.net8.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
3131
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
3232
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
33-
34-
<PackageReference Include="Microsoft.Net.Http.Headers">
35-
<Version>2.2.8</Version>
36-
</PackageReference>
3733
</ItemGroup>
3834

3935
<ItemGroup>

‎src/Senparc.CO2NET.Cache.CsRedis/Senparc.CO2NET.Cache.CsRedis.csproj‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4-
<Version>2.3.0</Version>
5-
<LangVersion>latest</LangVersion>
6-
<AssemblyName>Senparc.CO2NET.Cache.CsRedis</AssemblyName>
7-
<RootNamespace>Senparc.CO2NET.Cache.CsRedis</RootNamespace>
8-
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
9-
<Description>
2+
<PropertyGroup>
3+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4+
<Version>2.3.1</Version>
5+
<LangVersion>latest</LangVersion>
6+
<AssemblyName>Senparc.CO2NET.Cache.CsRedis</AssemblyName>
7+
<RootNamespace>Senparc.CO2NET.Cache.CsRedis</RootNamespace>
8+
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
9+
<Description>
1010
CONET cache strategy - Redis module
1111

1212
CO2NET open source project:
1313
https://github.com/Senparc/Senparc.CO2NET
1414
</Description>
15-
<Copyright>Senparc Copyright © 2004~2024</Copyright>
16-
<PackageTags>Senparc.CO2NET,Cache,Redis,CO2NET,盛派</PackageTags>
17-
<Authors>Jeffrey Su</Authors>
18-
<Owners>Senparc</Owners>
19-
<PackageLicenseUrl>https://github.com/JeffreySu/WeiXinMPSDK/blob/master/license.md</PackageLicenseUrl>
20-
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
21-
<Title>Senparc.CO2NET.Cache.CsRedis.dll</Title>
22-
<Summary>CsRedis Cache for CO2NET C#</Summary>
23-
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
24-
<PackageIcon>icon.jpg</PackageIcon>
25-
<PackageReleaseNotes>
15+
<Copyright>Senparc Copyright © 2004~2024</Copyright>
16+
<PackageTags>Senparc.CO2NET,Cache,Redis,CO2NET,盛派</PackageTags>
17+
<Authors>Jeffrey Su</Authors>
18+
<Owners>Senparc</Owners>
19+
<PackageLicenseUrl>https://github.com/JeffreySu/WeiXinMPSDK/blob/master/license.md</PackageLicenseUrl>
20+
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
21+
<Title>Senparc.CO2NET.Cache.CsRedis.dll</Title>
22+
<Summary>CsRedis Cache for CO2NET C#</Summary>
23+
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
24+
<PackageIcon>icon.jpg</PackageIcon>
25+
<PackageReleaseNotes>
2626
v0.1.0 Genesis
2727
v0.5.2 BaseRedisObjectCacheStrategy destructor performs null value check and adds "#{Cache_Redis_Configuration}#" filter check
2828
v1.1.4 RedisObjectCacheStrategy and RedisHashSetObjectCacheStrategy.Get() methods add pure string check
@@ -32,49 +32,49 @@
3232
[2024-11-28] v2.1.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
3333
[2024-12-04] v2.2.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
3434
[2025-08-18] v2.3.0 update BaseRedisObjectCacheStrategy.Client init progress
35-
</PackageReleaseNotes>
36-
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
37-
<Configurations>Debug;Release;Test</Configurations>
38-
</PropertyGroup>
39-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
40-
<OutputPath>..\BuildOutPut</OutputPath>
41-
<DefineConstants>TRACE</DefineConstants>
42-
</PropertyGroup>
43-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
44-
<OutputPath>..\..\BuildOutPut</OutputPath>
45-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
46-
<DocumentationFile>..\BuildOutPut\Senparc.CO2NET.Cache.CsRedis.XML</DocumentationFile>
47-
<Optimize>true</Optimize>
48-
<DebugType>pdbonly</DebugType>
49-
<ErrorReport>prompt</ErrorReport>
50-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
51-
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
53-
<OutputPath>..\BuildOutPut\</OutputPath>
54-
<DocumentationFile>..\BuildOutPut\net462\Senparc.CO2NET.Cache.CsRedis.xml</DocumentationFile>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
57-
<OutputPath>..\BuildOutPut\</OutputPath>
58-
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.CO2NET.Cache.CsRedis.xml</DocumentationFile>
59-
</PropertyGroup>
60-
<ItemGroup>
61-
<None Include="..\Senparc.CO2NET\icon.jpg" Pack="true" Visible="false" PackagePath="" />
62-
</ItemGroup>
63-
<ItemGroup>
64-
<Compile Remove="packages\**" />
65-
<Compile Remove="ServiceStack.Redis\**" />
66-
<EmbeddedResource Remove="packages\**" />
67-
<EmbeddedResource Remove="ServiceStack.Redis\**" />
68-
<None Remove="packages\**" />
69-
<None Remove="ServiceStack.Redis\**" />
70-
</ItemGroup>
71-
<ItemGroup>
72-
<!--<PackageReference Include="Senparc.CO2NET.Cache.Redis.RedLock" Version="0.1.0" />-->
73-
<!--<PackageReference Include="BinaryFormatter" Version="3.0.0" />-->
74-
<PackageReference Include="CSRedisCore" Version="3.8.800" />
75-
</ItemGroup>
76-
<ItemGroup>
77-
<ProjectReference Include="..\Senparc.CO2NET.Cache.CsRedis.RedLock\redlock-cs\src\Senparc.CO2NET.Cache.CsRedis.RedLock.csproj" />
78-
<ProjectReference Include="..\Senparc.CO2NET\Senparc.CO2NET.csproj" />
79-
</ItemGroup>
35+
</PackageReleaseNotes>
36+
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
37+
<Configurations>Debug;Release;Test</Configurations>
38+
</PropertyGroup>
39+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
40+
<OutputPath>..\BuildOutPut</OutputPath>
41+
<DefineConstants>TRACE</DefineConstants>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
44+
<OutputPath>..\..\BuildOutPut</OutputPath>
45+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
46+
<DocumentationFile>..\BuildOutPut\Senparc.CO2NET.Cache.CsRedis.XML</DocumentationFile>
47+
<Optimize>true</Optimize>
48+
<DebugType>pdbonly</DebugType>
49+
<ErrorReport>prompt</ErrorReport>
50+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
53+
<OutputPath>..\BuildOutPut\</OutputPath>
54+
<DocumentationFile>..\BuildOutPut\net462\Senparc.CO2NET.Cache.CsRedis.xml</DocumentationFile>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
57+
<OutputPath>..\BuildOutPut\</OutputPath>
58+
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.CO2NET.Cache.CsRedis.xml</DocumentationFile>
59+
</PropertyGroup>
60+
<ItemGroup>
61+
<None Include="..\Senparc.CO2NET\icon.jpg" Pack="true" Visible="false" PackagePath="" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Compile Remove="packages\**" />
65+
<Compile Remove="ServiceStack.Redis\**" />
66+
<EmbeddedResource Remove="packages\**" />
67+
<EmbeddedResource Remove="ServiceStack.Redis\**" />
68+
<None Remove="packages\**" />
69+
<None Remove="ServiceStack.Redis\**" />
70+
</ItemGroup>
71+
<ItemGroup>
72+
<!--<PackageReference Include="Senparc.CO2NET.Cache.Redis.RedLock" Version="0.1.0" />-->
73+
<!--<PackageReference Include="BinaryFormatter" Version="3.0.0" />-->
74+
<PackageReference Include="CSRedisCore" Version="3.8.800" />
75+
</ItemGroup>
76+
<ItemGroup>
77+
<ProjectReference Include="..\Senparc.CO2NET.Cache.CsRedis.RedLock\redlock-cs\src\Senparc.CO2NET.Cache.CsRedis.RedLock.csproj" />
78+
<ProjectReference Include="..\Senparc.CO2NET\Senparc.CO2NET.csproj" />
79+
</ItemGroup>
8080
</Project>

‎src/Senparc.CO2NET.Cache.Dapr/Senparc.CO2NET.Cache.Dapr.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
<TargetFramework>net8.0</TargetFramework>
4-
<Version>1.1.0.1</Version>
4+
<Version>1.1.1</Version>
55
<AssemblyName>Senparc.CO2NET.Cache.Dapr</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.Cache.Dapr</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

‎src/Senparc.CO2NET.Cache.Memcached/Senparc.CO2NET.Cache.Memcached.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;net8.0</TargetFrameworks>
4-
<Version>5.1.0.1</Version>
4+
<Version>5.1.1</Version>
55
<AssemblyName>Senparc.CO2NET.Cache.Memcached</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.Cache.Memcached</RootNamespace>
77
<Description>

‎src/Senparc.CO2NET.Cache.Redis.RedLock/redlock-cs/src/Senparc.CO2NET.Cache.Redis.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>4.1.0.1</Version>
4+
<Version>4.1.1</Version>
55
<AssemblyName>Senparc.CO2NET.Cache.Redis.RedLock</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.Cache.Redis.RedLock</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

‎src/Senparc.CO2NET.Cache.Redis.Tests/Senparc.CO2NET.Cache.Redis.Tests.net8.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
3131
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
3232
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
33-
34-
<PackageReference Include="Microsoft.Net.Http.Headers">
35-
<Version>2.2.8</Version>
36-
</PackageReference>
3733
</ItemGroup>
3834

3935
<ItemGroup>

0 commit comments

Comments
 (0)