Skip to content

Commit

Permalink
Merge pull request #3079 from JeffreySu/Developer
Browse files Browse the repository at this point in the history
更新基础库,简化 .NET 版本支持,发布新版本
  • Loading branch information
JeffreySu authored Oct 8, 2024
2 parents b4b9f39 + e6cd337 commit f696a21
Show file tree
Hide file tree
Showing 42 changed files with 2,142 additions and 84 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<None Remove="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.AI.Agents" Version="0.1.4" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.17.4" />
<PackageReference Include="Senparc.AI.Agents" Version="0.2.0" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.18.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.4.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.1.4" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.17.4" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.6.2" />
<PackageReference Include="Senparc.AI.Agents" Version="0.2.0" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.18.0" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.7.0" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.4.3" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.Weixin.All" Version="2024.8.1.1-beta1" />
<PackageReference Include="Senparc.Weixin.All" Version="2024.9.11" />
</ItemGroup>
<!-- 此节点为 Sample 共享文件需要而添加,实际项目无需添加 -->
<Import Project="..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems" Label="Shared" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.22.1" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.15.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.22.3" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.3.3" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.15.3" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.22.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.15.1" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.16.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.22.3" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.15.3" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.16.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.22.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.15.1" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.6.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.22.3" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.15.3" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.6.4" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.22.1" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.3" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.23.1" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.3.3" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.6.1" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.20.1" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.3.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.3.3" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.6.4" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.20.4" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.3.3" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net8.0</TargetFrameworks>
<Version>1.0.4</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<Description>
微信 SDK - WebSocket 模块

Senparc.Weixin SDK 开源项目:
https://github.com/JeffreySu/WeiXinMPSDK
</Description>
<Copyright>Senparc Copyright © 2004~2024</Copyright>
<PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,WebSocket</PackageTags>
<Authors>Jeffrey Su</Authors>
<Owners>Senparc</Owners>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
<Title>Senparc.WebSocket.dll</Title>
<Summary>微信 SDK for .NET / C#</Summary>
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
<PackageIcon>icon.jpg</PackageIcon>
<PackageReleaseNotes>
v0.1.1 完成MessageHandler、WebSocketHandler等基础架构,完成基本消息通讯

v0.1.3 优化WebSocket通讯机制

v0.2.0 支持 .NET Core

v0.3.0 支持 .NET Core 2.0
v0.3.1
1、提供WebSocketHandler.IsReusable返回值(true)
2、升级Newtonsoft.Json版本至10.0.1
v0.3.2 注册WebSocketMessageHandler,自定义对象的实例化方法,用以支持Spring等框架的注入
v0.3.3 常规优化
v0.4.0 停止对 .net core 1.1 生成的独立版本

v0.5.0-rc1 支持 .NET Core 2.1.0

v0.5.5 发布支持 .net core 2.1 的正式版
v0.6.0 支持最新基础库,使用 .NETStandard2.0 统一支持 .NET Core,放弃对 .NET Core 1.x 的单独适配
v0.7.3 全局使用 .ConfigureAwait(false) 应对异步锁死问题
v0.8.0
1、支持 .NET Core SignalR
2、提供 Register 注册方法
3、优化 WebSocketMesssageHandler
v0.8.1 引用最新版本 CO2NET
v0.8.2 引用最新版本 CO2NET
v0.8.3 提供带符号的 nuget 包(.snupkg)
v0.9.0 使用最新版本 Senparc.Weixin,支持 .NET Core 3.0
v1.0.3 清理引用项目
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\..\..\..\BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\..\..\BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
<DocumentationFile>..\..\..\..\BuildOutPut\Senparc.WebSocket.xml</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
<OutputPath>..\..\..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\BuildOutPut\net462\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\..\..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\BuildOutPut\netstandard2.0\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\..\..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\BuildOutPut\netstandard2.1\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
<OutputPath>..\..\..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\BuildOutPut\netcoreapp3.1\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
<OutputPath>..\..\..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\BuildOutPut\net8.0\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<!--<Reference Include="System.Web.Optimization" />-->
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
<!--<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />-->
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<!--<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />-->
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="2.5.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="2.5.1" />
<PackageReference Include="Senparc.CO2NET" Version="2.5.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Senparc.Weixin.All/Senparc.Weixin.All.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>2024.9.11</Version>
<Version>2024.10.8</Version>
<LangVersion>10.0</LangVersion>
<AssemblyName>Senparc.Weixin.All</AssemblyName>
<RootNamespace>Senparc.Weixin.All</RootNamespace>
Expand Down Expand Up @@ -47,6 +47,7 @@
[2024-08-12] v2024.8.12 升级 Senparc.Weixin.Work
[2024-09-02] v2024.9.2 WxOpen 支持小程序付费能力的用量告警事件
[2024-09-10] v2024.9.10 更新基础库,包括缓存、APM、CO2NET 核心模块等全面升级
[2024-10-08] v2024.10.8 更新基础库,简化 .NET 版本支持
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>1.3.3</Version>
<Version>1.3.4</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<!--<OutputType>Library</OutputType>-->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>1.0.3</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<Description>
微信 SDK - Redis 模块

Senparc.Weixin SDK 开源项目:
https://github.com/JeffreySu/WeiXinMPSDK
</Description>
<Copyright>Senparc Copyright © 2004~2024</Copyright>
<PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,Cache,Redis</PackageTags>
<Authors>Jeffrey Su</Authors>
<Owners>Senparc</Owners>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
<Title>Senparc.Weixin.Cache.CsRedis.dll</Title>
<Summary>微信 SDK for .NET / C#</Summary>
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
<PackageIcon>icon.jpg</PackageIcon>
<PackageReleaseNotes>
v0.1.0
创世
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\..\BuildOutPut</OutputPath>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
<DocumentationFile>..\..\BuildOutPut\Senparc.Weixin.Cache.CsRedis.XML</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
<OutputPath>..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\BuildOutPut\net462\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\BuildOutPut\netstandard2.0\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\..\BuildOutPut\</OutputPath>
<DocumentationFile>..\..\BuildOutPut\netstandard2.1\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup>
<Compile Remove="ContainerCacheStrategy\RedisContainerCacheStrategy.RedisUtils.cs" />
</ItemGroup>
<ItemGroup>
<!--<PackageReference Include="Senparc.Weixin.Cache.Redis.RedLock" Version="0.1.0" />-->
<!--<PackageReference Include="BinaryFormatter" Version="2.1.4" />-->
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="1.2.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<ItemGroup>
<!--<PackageReference Include="Senparc.Weixin.Cache.Redis.RedLock" Version="0.1.0" />-->
<!--<PackageReference Include="BinaryFormatter" Version="2.1.4" />-->
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="1.2.5" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="1.2.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
Loading

0 comments on commit f696a21

Please sign in to comment.