Skip to content

Commit

Permalink
Merge pull request #2633 from JeffreySu/Developer
Browse files Browse the repository at this point in the history 
Developer
  • Loading branch information
@JeffreySu
JeffreySu authored May 4, 2022
2 parents aa1770e + 66c7f4a commit fb8688c
Show file tree
Hide file tree
Showing 67 changed files with 356 additions and 6,479 deletions.
159 changes: 113 additions & 46 deletions ...s/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net45Sample.CommonService.csproj
View file

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions ...ll/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.NetCore3Sample.CommonService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,20 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar" Version="1.5.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
<PackageReference Include="Senparc.WebSocket" Version="0.17.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.2" />
<PackageReference Include="Senparc.Weixin.Open" Version="4.14.2" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.12.1" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.15.3-beta3" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.15.3" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageReference Include="ZXing.Net" Version="0.16.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Senparc.WebSocket\src\Senparc.WebSocket\Senparc.WebSocket\Senparc.WebSocket.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.Cache\Senparc.Weixin.Cache.Memcached\Senparc.Weixin.Cache.Memcached.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.Cache\Senparc.Weixin.Cache.Redis\Senparc.Weixin.Cache.Redis.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.Open\Senparc.Weixin.Open\Senparc.Weixin.Open.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.TenPay\Senparc.Weixin.TenPay\Senparc.Weixin.TenPay.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.Work\Senparc.Weixin.Work\Senparc.Weixin.Work.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin.WxOpen\src\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen.netcore3.csproj" />
<ProjectReference Include="..\..\..\src\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" />

</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/All/Senparc.Weixin.Sample.CommonService/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Enyim.Caching" publicKeyToken="cec98615db04012e" culture="neutral" />
Expand All @@ -38,4 +38,4 @@
</servers>
<!-- the client waits deadTmimeout time to reconnect to the pool when all the specified urls are down -->
<socketPool connectionTimeout="00:00:10" deadTimeout="00:00:10" />
</membase></configuration>
</membase><startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
67 changes: 45 additions & 22 deletions Samples/All/Senparc.Weixin.Sample.CommonService/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,58 +7,81 @@
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="2.0.3" targetFramework="net451" />
<package id="Senparc.CO2NET.APM" version="1.1.1" targetFramework="net451" />
<package id="Senparc.CO2NET.AspNet" version="1.0.2" targetFramework="net451" />
<package id="Senparc.CO2NET.Cache.Memcached" version="4.0.1" targetFramework="net451" />
<package id="Senparc.CO2NET.Cache.Redis" version="4.0.1" targetFramework="net451" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="3.0.1" targetFramework="net451" />
<package id="Senparc.NeuChar" version="2.0.5.1" targetFramework="net451" />
<package id="Senparc.NeuChar.App" version="1.0.5" targetFramework="net451" />
<package id="Senparc.NeuChar.AspNet" version="1.0.5" targetFramework="net451" />
<package id="Senparc.WebSocket" version="0.16.2" targetFramework="net451" />
<package id="Senparc.Weixin" version="6.14.3" targetFramework="net451" />
<package id="Senparc.Weixin.AspNet" version="0.7.3" targetFramework="net451" />
<package id="Senparc.Weixin.Cache.Memcached" version="2.12.3" targetFramework="net451" />
<package id="Senparc.Weixin.Cache.Redis" version="2.14.3" targetFramework="net451" />
<package id="Senparc.Weixin.MP" version="16.17.7" targetFramework="net451" />
<package id="Senparc.Weixin.MP.MVC" version="7.11.3" targetFramework="net451" />
<package id="Senparc.Weixin.Open" version="4.13.7" targetFramework="net451" />
<package id="Senparc.Weixin.TenPay" version="1.11.4" targetFramework="net451" />
<package id="Senparc.Weixin.Work" version="3.14.9" targetFramework="net451" />
<package id="Senparc.Weixin.WxOpen" version="3.14.9" targetFramework="net451" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="Senparc.CO2NET" version="2.1.0" targetFramework="net462" />
<package id="Senparc.CO2NET.APM" version="1.2.0" targetFramework="net462" />
<package id="Senparc.CO2NET.AspNet" version="1.1.0" targetFramework="net462" />
<package id="Senparc.CO2NET.Cache.Memcached" version="4.1.0" targetFramework="net462" />
<package id="Senparc.CO2NET.Cache.Redis" version="4.1.0" targetFramework="net462" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="3.1.0" targetFramework="net462" />
<package id="Senparc.NeuChar" version="2.1.1.1" targetFramework="net462" />
<package id="Senparc.NeuChar.App" version="1.1.1.1" targetFramework="net462" />
<package id="Senparc.NeuChar.AspNet" version="1.1.1.1" targetFramework="net462" />
<package id="Senparc.WebSocket" version="0.17.1" targetFramework="net462" />
<package id="Senparc.Weixin" version="6.15.1" targetFramework="net462" />
<package id="Senparc.Weixin.AspNet" version="0.8.1" targetFramework="net462" />
<package id="Senparc.Weixin.Cache.Memcached" version="2.13.1" targetFramework="net462" />
<package id="Senparc.Weixin.Cache.Redis" version="2.15.1" targetFramework="net462" />
<package id="Senparc.Weixin.MP" version="16.18.2" targetFramework="net462" />
<package id="Senparc.Weixin.MP.MVC" version="7.12.1" targetFramework="net462" />
<package id="Senparc.Weixin.Open" version="4.14.2" targetFramework="net462" />
<package id="Senparc.Weixin.TenPay" version="1.12.1" targetFramework="net462" />
<package id="Senparc.Weixin.Work" version="3.15.3-beta3" targetFramework="net462" />
<package id="Senparc.Weixin.WxOpen" version="3.15.3" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.5.43" targetFramework="net462" />
<package id="System.AppContext" version="4.3.0" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
<package id="System.Console" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.PerformanceCounter" version="5.0.0" targetFramework="net462" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net462" />
<package id="System.IO" version="4.3.0" targetFramework="net45" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net462" />
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net462" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="5.0.1" targetFramework="net462" />
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net462" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net451" />
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
<package id="System.Threading.Channels" version="5.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net451" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
Expand Down
Loading

0 comments on commit fb8688c

Please sign in to comment.