Squashed 'src/Senparc.WebSocket/' changes from 156252aee..10be708d1

10be708d1 发布新版本 d1deae7ae 升级新版本号 2a8749762 升级基础包 b0f59cd34 更新 NeuChar 包 #2113 感谢 @ulyanovsk ac26f936f 更新 CO2NET 及 NeuChar 包 c9b75144a 分配新版本号 fc8277100 Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer 0c9add199 v6.7.300 添加 CsRedis 的注册，同时引用最新版本 CO2NET b86de41b1 Sample v5.401.2，所有版本升级到 *.*.301 42523c503 发布 *.*.300 正式版 06e40f484 完成 Senparc DI 改造，发布正式版 e0f1fcc5e 发布新版本Preivew1 332da31d6 更新 NeuChar 及 CO2NET 最新版本 13cdfe360 modify 1f4f89c9b 发布正式版，分配版本号 bf65f6327 更新CO2NET正式版 673f99bca 升级到 preview，更新 CO2NET/NeuChar c1fbd9fc6 更新 nuget 包：CO2NET、NeuChar e792c075c 更新 copyright 年份信息 af8c0704c WebSocket v0.10.100-preview1 5a821562d 更新CO2NET和NeuChar，准备分离AspNet 214a58fbb v6.6.104 引用新版本 NeuChar，优化 MessageHandler 同步方法兼容策略 8c071e4a8 .net 4.5 Sample 更新 nuget 引用 d52ea1ee6 MP v16.9.103 解决 MessageHandler 初始化无响应的问题 git-subtree-dir: src/Senparc.WebSocket git-subtree-split: 10be708d173ffbbcc33f80f0298d3c73ef52a31a
JeffreySu · May 12, 2024 · 65c0c2c · 65c0c2c
1 parent f478ddc
commit 65c0c2c
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 83 deletions.
diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Helpers/WebSocketHelper.cs b/src/Senparc.WebSocket/Senparc.WebSocket/Helpers/WebSocketHelper.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：WebSocketHelper.cs
     文件功能描述：WebSocket处理类

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/MessageHandlers/WebSocketMessageHandler.cs b/src/Senparc.WebSocket/Senparc.WebSocket/MessageHandlers/WebSocketMessageHandler.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：WebSocketMessageHandler.cs
     文件功能描述：WebSocketMessageHandler基类

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Register.cs b/src/Senparc.WebSocket/Senparc.WebSocket/Register.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：Register.cs
     文件功能描述：注册 Senparc.WebSocket 服务

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Routes/WebSocketHandler/WebSocketHandler_NET45.cs b/src/Senparc.WebSocket/Senparc.WebSocket/Routes/WebSocketHandler/WebSocketHandler_NET45.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：WebSocketHandler.cs
     文件功能描述：WebSocket处理程序

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Routes/WebSocketRoute.cs b/src/Senparc.WebSocket/Senparc.WebSocket/Routes/WebSocketRoute.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：WebSocketRoute.cs
     文件功能描述：WebSocket的Route类（主要为了重写GetVirtualPath，

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Routes/WebSocketRouteHandler.cs b/src/Senparc.WebSocket/Senparc.WebSocket/Routes/WebSocketRouteHandler.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：WebSocketRouteHandler.cs
     文件功能描述：WebSocketRouteHandler，处理WebSocket请求

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.csproj b/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.csproj
@@ -85,7 +85,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Senparc.CO2NET">
-      <Version>1.0.102</Version>
+      <Version>1.0.103</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.netcore3.csproj b/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.netcore3.csproj
@@ -1,29 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <Version>0.9.102</Version>
+    <TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
+    <Version>0.10.500</Version>
     <AssemblyName>Senparc.WebSocket</AssemblyName>
     <RootNamespace>Senparc.WebSocket</RootNamespace>
-
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
-
     <Description>
       微信公众账号 - WebSocket 模块
 
       Senparc.Weixin SDK 开源项目：  
       https://github.com/JeffreySu/WeiXinMPSDK
     </Description>
-    <Copyright>Senparc Copyright © 2004~2019</Copyright>
+    <Copyright>Senparc Copyright © 2004~2020</Copyright>
     <PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,WebSocket</PackageTags>
-
-
     <Authors>Jeffrey Su</Authors>
     <Owners>Senparc</Owners>
     <PackageLicenseUrl>https://github.com/JeffreySu/WeiXinMPSDK/blob/master/license.md</PackageLicenseUrl>
     <ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
     <Title>Senparc.WebSocket.dll</Title>
-
     <Summary>微信公众号SDK for C#</Summary>
     <PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
     <PackageIconUrl>http://sdk.weixin.senparc.com/Images/Logo.jpg</PackageIconUrl>
@@ -55,14 +49,12 @@
       v0.8.2 引用最新版本 CO2NET
       v0.8.3 提供带符号的 nuget 包（.snupkg)
       v0.9.0 使用最新版本 Senparc.Weixin，支持 .NET Core 3.0
-    </PackageReleaseNotes>
+</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
@@ -73,18 +65,22 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
     <DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\net45\Senparc.WebSocket.xml</DocumentationFile>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
     <DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.0\Senparc.WebSocket.xml</DocumentationFile>
   </PropertyGroup>
-
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
+    <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
+    <DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.1\Senparc.WebSocket.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
+    <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
+    <DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netcoreapp3.1\Senparc.WebSocket.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -98,7 +94,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
@@ -107,52 +102,35 @@
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <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.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Senparc.CO2NET" Version="1.0.102" />
+    <PackageReference Include="Senparc.CO2NET" Version="1.3.104" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.SignalR">
-      <Version>1.1.0</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>-->
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-
-  <!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard1.6\Senparc.WebSocket.xml</DocumentationFile>
-  </PropertyGroup>-->
-
-  <!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-  </PropertyGroup>-->
 </Project>
diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.vs2017.csproj b/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.vs2017.csproj
@@ -1,13 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
-    <Version>0.9.0</Version>
+    <Version>0.9.400</Version>
     <AssemblyName>Senparc.WebSocket</AssemblyName>
     <RootNamespace>Senparc.WebSocket</RootNamespace>
-
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
-
     <Description>
       微信公众账号 - WebSocket 模块
 
@@ -16,14 +13,11 @@
     </Description>
     <Copyright>Senparc Copyright © 2004~2019</Copyright>
     <PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,WebSocket</PackageTags>
-
-
     <Authors>Jeffrey Su</Authors>
     <Owners>Senparc</Owners>
     <PackageLicenseUrl>https://github.com/JeffreySu/WeiXinMPSDK/blob/master/license.md</PackageLicenseUrl>
     <ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
     <Title>Senparc.WebSocket.dll</Title>
-
     <Summary>微信公众号SDK for C#</Summary>
     <PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
     <PackageIconUrl>http://sdk.weixin.senparc.com/Images/Logo.jpg</PackageIconUrl>
@@ -55,14 +49,12 @@
       v0.8.2 引用最新版本 CO2NET
       v0.8.3 提供带符号的 nuget 包（.snupkg)
       v0.9.0 使用最新版本 Senparc.Weixin，支持 .NET Core 3.0
-    </PackageReleaseNotes>
+</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
@@ -73,18 +65,14 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
     <DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\net45\Senparc.WebSocket.xml</DocumentationFile>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
     <OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
     <DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.0\Senparc.WebSocket.xml</DocumentationFile>
   </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -98,7 +86,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
@@ -108,33 +95,27 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Senparc.CO2NET" Version="1.0.102" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.AspNetCore.SignalR">
       <Version>1.1.0</Version>
     </PackageReference>
   </ItemGroup>
-
   <!--<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
@@ -143,15 +124,12 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>-->
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-
   <!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
     <DocumentationFile>bin\Release\netstandard1.6\Senparc.WebSocket.xml</DocumentationFile>
   </PropertyGroup>-->
-
   <!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
     <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>-->

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/SignalR/SenparcWebSocketHubBase.cs b/src/Senparc.WebSocket/Senparc.WebSocket/SignalR/SenparcWebSocketHubBase.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：SenparcWebSocketHubBase.cs
     文件功能描述：SenparcWebSocketHub 基类
@@ -9,7 +9,7 @@
 
 ----------------------------------------------------------------*/
 
-#if NETSTANDARD2_0 || NETCOREAPP3_0
+#if !NET45
 using Microsoft.AspNetCore.SignalR;
 using Senparc.WebSocket.Exceptions;
 using System;

diff --git a/src/Senparc.WebSocket/Senparc.WebSocket/WebSocketConfig.cs b/src/Senparc.WebSocket/Senparc.WebSocket/WebSocketConfig.cs
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------
-    Copyright (C) 2019 Senparc
+    Copyright (C) 2020 Senparc
 
     文件名：WebSocketRouteConfig.cs
     文件功能描述：自动配置WebSocket路由