更新Nuget版本信息

mc7246 · Jun 20, 2022 · a63d1b1 · a63d1b1
1 parent 93b2513
commit a63d1b1
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 18 deletions.
diff --git a/...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net6Sample.CommonService.csproj b/...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net6Sample.CommonService.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+	  <PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
 	  <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
 	  <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
 	  <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />

diff --git a/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Senparc.Weixin.Sample.Net6.csproj b/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Senparc.Weixin.Sample.Net6.csproj
@@ -15,8 +15,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.2.0" />
-		<PackageReference Include="Senparc.NeuChar.App" Version="1.1.1.1" />
-		<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
+		<PackageReference Include="Senparc.NeuChar.App" Version="1.2.0.1" />
+		<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.2.0.1" />
 
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />

diff --git a/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net6.csproj b/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net6.csproj
@@ -75,7 +75,7 @@
     <!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.2.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />

diff --git a/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net6.csproj b/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net6.csproj
@@ -70,7 +70,7 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.2.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net6.csproj" />

diff --git a/...MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.net6.csproj b/...MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.net6.csproj
@@ -147,7 +147,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.net6.csproj" />

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.net6.csproj b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.net6.csproj
@@ -574,8 +574,8 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Senparc.CO2NET.APM" Version="1.2.0" />
-		<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
-		<PackageReference Include="Senparc.NeuChar.App" Version="1.1.1.1" />
+		<PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
+		<PackageReference Include="Senparc.NeuChar.App" Version="1.2.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />

diff --git a/...in.MP/Senparc.WeixinTests/Entities/Request/Extensions/RequestMessageTextExtensionTests.cs b/...in.MP/Senparc.WeixinTests/Entities/Request/Extensions/RequestMessageTextExtensionTests.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Senparc.Weixin.MP.Entities;
+using Senparc.CO2NET.Extensions;
 
 namespace Senparc.NeuChar.Entities.Request.Tests
 {
@@ -21,14 +22,14 @@ public void KeywordTest()
             {
                 //大小写不敏感
                 requestMessage.Content = "Case1";
-                 result = requestMessage.StartHandler(false)
-                    .Keyword("CASe1", () => null)
-                    .MatchSuccessed;
+                result = requestMessage.StartHandler(false)
+                   .Keyword("CASe1", () => null)
+                   .MatchSuccessed;
                 Assert.IsTrue(result);
 
                 requestMessage.Content = "Case1";
                 result = requestMessage.StartHandler(false)
-                   .Keywords(new []{"CaSe1","case2"}, () => null)
+                   .Keywords(new[] { "CaSe1", "case2" }, () => null)
                    .MatchSuccessed;
                 Assert.IsTrue(result);
 
@@ -58,6 +59,30 @@ public void KeywordTest()
                 .MatchSuccessed;
                 Assert.IsFalse(result);
             }
+
+            {
+                //异步方法
+                requestMessage.Content = "case123";
+                var handler = requestMessage.StartHandler(true)
+                 .RegexAsync(@"case\d+", async () =>
+                 {
+                     Console.WriteLine(SystemTime.Now.ToString("mm:ss.ffff"));
+                     await Task.Delay(10);
+                     Console.WriteLine(SystemTime.Now.ToString("mm:ss.ffff"));
+                     var responseMessage = new ResponseMessageText();
+                     responseMessage.Content = @"case\d+";
+                     return responseMessage;
+                 }).Result
+                 .KeywordAsync("CaseA", async () =>
+                 {
+                     var responseMessage = new ResponseMessageText();
+                     responseMessage.Content = @"CaseA";
+                     Console.WriteLine(responseMessage.ToJson(true));
+                     return responseMessage;
+                 }).Result;
+                result = handler.MatchSuccessed;
+                Assert.IsTrue(result);
+            }
         }
     }
 }
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net6.csproj b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net6.csproj
@@ -239,7 +239,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />

diff --git a/src/Senparc.Weixin.Work.Middleware/Senparc.Weixin.Work.Middleware.net6.csproj b/src/Senparc.Weixin.Work.Middleware/Senparc.Weixin.Work.Middleware.net6.csproj
@@ -67,7 +67,7 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.2.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin.Work\Senparc.Weixin.Work\Senparc.Weixin.Work.net6.csproj" />

diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.net6.csproj b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.net6.csproj
@@ -226,7 +226,7 @@
 		<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+		<PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />

diff --git a/src/Senparc.Weixin.WxOpen.Middleware/Senparc.Weixin.WxOpen.Middleware.net6.csproj b/src/Senparc.Weixin.WxOpen.Middleware/Senparc.Weixin.WxOpen.Middleware.net6.csproj
@@ -67,7 +67,7 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.2.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin.WxOpen\src\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen.net6.csproj" />

diff --git a/....WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.net6.csproj b/....WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.net6.csproj
@@ -207,7 +207,7 @@
 		<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+		<PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net6.csproj" />

diff --git a/src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.net6.csproj b/src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.net6.csproj
@@ -369,7 +369,7 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Senparc.CO2NET" Version="2.1.0" />
-    <PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.2.0.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Core" />