Skip to content

Commit

Permalink
更新 net45-mvc 到 net462
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeffreySu
JeffreySu committed May 4, 2022
1 parent 8d26fef commit d6a221f
Show file tree
Hide file tree
Showing 14 changed files with 333 additions and 150 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.

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
2 changes: 1 addition & 1 deletion Samples/All/net45-mvc/Senparc.Weixin.MP.Sample/Controllers/HomeController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public ActionResult Index()
TempData["WeixinVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.Config));
TempData["TenPayVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.TenPay.Register));//DPBMARK TenPay DPBMARK_END
TempData["MpVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.MP.Register));//DPBMARK MP DPBMARK_END
TempData["ExtensionVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.MP.MvcExtension.FixWeixinBugWeixinResult));//DPBMARK MP DPBMARK_END
TempData["ExtensionVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.MP.MvcExtension.SenparcOAuthAttribute));//DPBMARK MP DPBMARK_END
TempData["OpenVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.Open.Register));//DPBMARK Open DPBMARK_END
//TempData["QYVersion"] = getDisplayVersion(getFileVersionInfo("Senparc.Weixin.QY.dll"));//已经停止更新
TempData["WorkVersion"] = getTypeVersionInfo(typeof(Senparc.Weixin.Work.Register));//DPBMARK Work DPBMARK_END
Expand Down
1 change: 1 addition & 0 deletions Samples/All/net45-mvc/Senparc.Weixin.MP.Sample/Controllers/Open/OpenController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System;
using System.IO;
using System.Web.Mvc;
using Senparc.Weixin.AspNet.MvcExtension;

namespace Senparc.Weixin.MP.Sample.Controllers
{
Expand Down
1 change: 1 addition & 0 deletions Samples/All/net45-mvc/Senparc.Weixin.MP.Sample/Controllers/WeixinAsyncController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;
using System.IO;
using System.Threading;
using Senparc.Weixin.AspNet.MvcExtension;

namespace Senparc.Weixin.MP.Sample.Controllers
{
Expand Down
1 change: 1 addition & 0 deletions Samples/All/net45-mvc/Senparc.Weixin.MP.Sample/Controllers/WeixinController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
namespace Senparc.Weixin.MP.Sample.Controllers
{
using Senparc.CO2NET.Utilities;
using Senparc.Weixin.AspNet.MvcExtension;
using Senparc.Weixin.MP.MvcExtension;
using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;

Expand Down
1 change: 1 addition & 0 deletions Samples/All/net45-mvc/Senparc.Weixin.MP.Sample/Controllers/Work/WorkController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Web.Mvc;
using System.Xml.Linq;
using Senparc.CO2NET.Utilities;
using Senparc.Weixin.AspNet.MvcExtension;
using Senparc.Weixin.MP.MvcExtension;
using Senparc.Weixin.Sample.CommonService.WorkMessageHandlers;
using Senparc.Weixin.Work.Entities;
Expand Down
1 change: 1 addition & 0 deletions Samples/All/net45-mvc/Senparc.Weixin.MP.Sample/Controllers/WxOpen/WxOpenController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using Senparc.Weixin.TenPay.V3;
using Senparc.Weixin.Sample.CommonService;
using Senparc.CO2NET.Utilities;
using Senparc.Weixin.AspNet.MvcExtension;

namespace Senparc.Weixin.MP.Sample.Controllers.WxOpen
{
Expand Down
Loading

0 comments on commit d6a221f

Please sign in to comment.