Skip to content

Commit

Permalink
Merge pull request #3042 from JeffreySu/Developer
Browse files Browse the repository at this point in the history
Developer
  • Loading branch information
JeffreySu authored Jul 13, 2024
2 parents 070a6a5 + 9ef7cf5 commit 33a1dd1
Show file tree
Hide file tree
Showing 26 changed files with 198 additions and 198 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.AI.Agents" Version="0.1.1-beta1" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.16.1.2-beta1" />
<PackageReference Include="Senparc.NeuChar" Version="2.4.1" />
<PackageReference Include="Senparc.AI.Agents" Version="0.1.3-beta1" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.16.3-beta1" />
<PackageReference Include="Senparc.NeuChar" Version="2.4.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.1.1-beta1" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.16.1.2-beta1" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.5.2.1" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.4.1" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.4.1" />
<PackageReference Include="Senparc.AI.Agents" Version="0.1.3-beta1" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.16.3-beta1" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.5.3" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.4.2" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.4.2" />

<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.2" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.2" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.2.2" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.2" />
</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.2.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.1" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.14.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.2" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.2" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.14.2" />
<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.2.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.1" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.3.1.2" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.2" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.2" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.4.0" />
<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.2.1" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.21.1" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.2.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.21.2" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.2.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.2.1" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.3.1.2" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.18.1" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.2.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.4.0" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.19.0" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.2.3" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
4 changes: 2 additions & 2 deletions Samples/deploy-sample-net8.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# deploy.ps1
# deploy-sample-net8.ps1
param (
[string]$sourcePath,
[string]$destinationPath,
Expand All @@ -18,7 +18,7 @@ function Copy-Files {
)

# 使用SCP命令上传文件
$scpCommand = "scp -i $privateKey -r $source $username@$server:$destination"
$scpCommand = "scp -i `${privateKey} -r `${source} `${username}@`${server}:${destination}"
Invoke-Expression $scpCommand
}

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;netcoreapp3.1;net8.0</TargetFrameworks>
<Version>0.19.2</Version>
<Version>0.19.3</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
2 changes: 1 addition & 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.6.29</Version>
<Version>2024.7.14</Version>
<LangVersion>10.0</LangVersion>
<AssemblyName>Senparc.Weixin.All</AssemblyName>
<RootNamespace>Senparc.Weixin.All</RootNamespace>
Expand Down
158 changes: 79 additions & 79 deletions src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net8.csproj
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>1.2.3</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<!--<OutputType>Library</OutputType>-->
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<Description>
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>1.2.4</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<!--<OutputType>Library</OutputType>-->
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<Description>
微信 SDK - Senparc.Weixin.AspNet 模块

Senparc.Weixin SDK 开源项目:
https://github.com/JeffreySu/WeiXinMPSDK
</Description>
<Copyright>Senparc Copyright © 2004~2024</Copyright>
<PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,MVC,System.Web.Mvc</PackageTags>
<Authors>Jeffrey Su</Authors>
<Owners>Senparc</Owners>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
<Title>Senparc.Weixin.AspNet.dll</Title>
<Summary>微信 SDK for .NET / C#</Summary>
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
<PackageIcon>icon.jpg</PackageIcon>
<PackageReleaseNotes>
<Copyright>Senparc Copyright © 2004~2024</Copyright>
<PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,MVC,System.Web.Mvc</PackageTags>
<Authors>Jeffrey Su</Authors>
<Owners>Senparc</Owners>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
<Title>Senparc.Weixin.AspNet.dll</Title>
<Summary>微信 SDK for .NET / C#</Summary>
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
<PackageIcon>icon.jpg</PackageIcon>
<PackageReleaseNotes>
v0.1.0 创世
v0.7.4
1、优化 UseSenparcWeixin()
2、添加 WeixinResult、FixWeixinBugWeixinResult
v0.8.5.2 修复证书传入参数可能为 null 的问题
v1.0.0 发布正式版;UseSenparcWeixin() 方法添加 autoCreateApi 参数,用于设置是自动生成微信接口的 API,默认为关闭
v1.2.3 UseSenparcWeixin() 方法添加 useSenparcWeixin 参数,用于指定是否自动执行 register.UseSenparcWeixin() 方法
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
<PackageId>Senparc.Weixin.AspNet</PackageId>
</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.Weixin.AspNet.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.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\BuildOutPut\</OutputPath>
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\BuildOutPut\</OutputPath>
<DocumentationFile>..\BuildOutPut\netstandard2.1\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
<OutputPath>..\BuildOutPut\</OutputPath>
<DocumentationFile>..\BuildOutPut\net8.0\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
<Version>2.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
<PackageId>Senparc.Weixin.AspNet</PackageId>
</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.Weixin.AspNet.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.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\BuildOutPut\</OutputPath>
<DocumentationFile>..\BuildOutPut\netstandard2.0\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\BuildOutPut\</OutputPath>
<DocumentationFile>..\BuildOutPut\netstandard2.1\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
<OutputPath>..\BuildOutPut\</OutputPath>
<DocumentationFile>..\BuildOutPut\net8.0\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
<Version>2.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>
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>0.10.2</Version>
<Version>0.10.3</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
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>2.15.2</Version>
<Version>2.15.3</Version>
<AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
<Description>
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>2.17.2</Version>
<Version>2.17.3</Version>
<AssemblyName>Senparc.Weixin.Cache.Redis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Redis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
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;netcoreapp3.1;net8.0</TargetFrameworks>
<Version>1.2.3</Version>
<Version>1.2.4</Version>
<AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
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;netcoreapp3.1;net8.0</TargetFrameworks>
<Version>7.14.2</Version>
<Version>7.14.3</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
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>16.21.2</Version>
<Version>16.21.3</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="Senparc.CO2NET.AspNet" Version="1.3.2" />
<PackageReference Include="Senparc.CO2NET.AspNet" Version="1.3.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 33a1dd1

Please sign in to comment.