Merge pull request #2561 from JeffreySu/Developer

Developer
JeffreySu · Feb 4, 2022 · 75878e5 · 75878e5
2 parents 2f4b290 + aa917e8
commit 75878e5
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 33 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -0,0 +1,72 @@
+# ASP.NET Core (.NET Framework)
+# Build and test ASP.NET Core projects targeting the full .NET Framework.
+# Add steps that publish symbols, save build artifacts, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core
+
+trigger:
+- master
+
+pool:
+  vmImage: 'windows-latest'
+
+variables:
+  solution: '**/tools/Senparc.Weixin.CLI/*.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: NuGetToolInstaller@1
+
+# - task: NuGetCommand@2
+#   inputs:
+#     restoreSolution: '$(solution)'
+
+
+# - task: VSBuild@1
+#   inputs:
+#     solution: '$(solution)'
+#     msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:DesktopBuildPackageLocation="$(build.artifactStagingDirectory)\WebApp.zip" /p:DeployIisAppPath="Default Web Site"'
+#     platform: '$(buildPlatform)'
+#     configuration: '$(buildConfiguration)'
+
+
+- task: NuGetCommand@2
+  inputs:
+    command: 'restore'
+    restoreSolution: '$(solution)'
+    feedsToUse: 'config'
+    externalFeedCredentials: 'Nuget-V3-SupportSymbol'
+
+- task: DotNetCoreCLI@2
+  displayName: Build
+  inputs:
+    command: build
+    projects: '$(solution)'
+    arguments: '--configuration Release'
+
+- task: NuGetCommand@2
+  displayName: Senparc.Weixin.CLI
+  inputs:
+    command: push
+    packagesToPush: '**/Weixin.*.nupkg'
+    nuGetFeedType: external
+    publishFeedCredentials: 'Nuget-V3-SupportSymbol'
+  continueOnError: true
+  condition: succeededOrFailed()
+
+
+- task: NuGetCommand@2
+  displayName: Senparc.WeChat.CLI
+  inputs:
+    command: push
+    packagesToPush: '**/WeChat.*.nupkg'
+    nuGetFeedType: external
+    publishFeedCredentials: 'Nuget-V3-SupportSymbol'
+  continueOnError: true
+  condition: succeededOrFailed()
+
+
+# - task: VSTest@2
+#   inputs:
+#     platform: '$(buildPlatform)'
+#     configuration: '$(buildConfiguration)'
diff --git a/tools/Senparc.Weixin.CLI/Senparc.Weixin.CLI.csproj b/tools/Senparc.Weixin.CLI/Senparc.Weixin.CLI.csproj
@@ -6,18 +6,28 @@
 		<Version>0.1.0</Version>
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<Nullable>enable</Nullable>
-		<AssemblyName>Weixin</AssemblyName>
+		<AssemblyName>Weixin.CLI</AssemblyName>
 		<RootNamespace>Senparc.Weixin</RootNamespace>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>weixin</ToolCommandName>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
 		<Description>
-			微信
+			微信 CLI
 
 			Senparc.Weixin SDK 开源项目：
 			https://github.com/JeffreySu/WeiXinMPSDK
+
+			可使用命令行安装：
+
+			`dotnet tool install -g Weixin.CLI`
+
+			使用命令行卸载：
+
+			`dotnet tool uninstall -g Weixin.CLI`
+
 		</Description>
+
 		<Copyright>Senparc Copyright © 2004~2021</Copyright>
 		<PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,WebSocket</PackageTags>
 		<Authors>Jeffrey Su</Authors>
@@ -29,33 +39,7 @@
 		<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
 		<PackageIconUrl>http://sdk.weixin.senparc.com/Images/Logo.jpg</PackageIconUrl>
 		<PackageReleaseNotes>
-			v0.1.1 完成MessageHandler、WebSocketHandler等基础架构，完成基本消息通讯
-
-			v0.1.3 优化WebSocket通讯机制
-
-			v0.2.0 支持 .NET Core
-
-			v0.3.0 支持 .NET Core 2.0
-			v0.3.1
-			1、提供WebSocketHandler.IsReusable返回值（true）
-			2、升级Newtonsoft.Json版本至10.0.1
-			v0.3.2 注册WebSocketMessageHandler，自定义对象的实例化方法，用以支持Spring等框架的注入
-			v0.3.3 常规优化
-			v0.4.0 停止对 .net core 1.1 生成的独立版本
-
-			v0.5.0-rc1 支持 .NET Core 2.1.0
-
-			v0.5.5 发布支持 .net core 2.1 的正式版
-			v0.6.0 支持最新基础库，使用 .NETStandard2.0 统一支持 .NET Core，放弃对 .NET Core 1.x 的单独适配
-			v0.7.3 全局使用 .ConfigureAwait(false) 应对异步锁死问题
-			v0.8.0
-			1、支持 .NET Core SignalR
-			2、提供 Register 注册方法
-			3、优化 WebSocketMesssageHandler
-			v0.8.1 引用最新版本 CO2NET
-			v0.8.2 引用最新版本 CO2NET
-			v0.8.3 提供带符号的 nuget 包（.snupkg)
-			v0.9.0 使用最新版本 Senparc.Weixin，支持 .NET Core 3.0
+			v0.1 创世
 		</PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
 

diff --git a/tools/Senparc.Weixin.CLI/Senparc.Weixin.CLI.sln b/tools/Senparc.Weixin.CLI/Senparc.Weixin.CLI.sln
@@ -20,7 +20,6 @@ Global
 		{B2BDB137-9773-4162-8533-8759381AD4AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2BDB137-9773-4162-8533-8759381AD4AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2BDB137-9773-4162-8533-8759381AD4AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2BDB137-9773-4162-8533-8759381AD4AA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/tools/Senparc.Weixin.CLI/Senparc.Weixin.CLI.wechat.csproj b/tools/Senparc.Weixin.CLI/Senparc.Weixin.CLI.wechat.csproj
@@ -3,17 +3,50 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<!--<TargetFramework>net5.0</TargetFramework>-->
-		<Version>1.0.0</Version>
+		<Version>0.1.0</Version>
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<Nullable>enable</Nullable>
-		<AssemblyName>WeChat</AssemblyName>
+		<AssemblyName>WeChat.CLI</AssemblyName>
+		<RootNamespace>Senparc.Weixin</RootNamespace>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>wechat</ToolCommandName>
-
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+
+		<Description>
+			微信 CLI
+
+			Senparc.Weixin SDK 开源项目：
+			https://github.com/JeffreySu/WeiXinMPSDK
+
+			可使用命令行安装：
+
+			`dotnet tool install -g WeChat.CLI`
+
+			使用命令行卸载：
+
+			`dotnet tool uninstall -g WeChat.CLI`
+
+		</Description>
+		<Copyright>Senparc Copyright © 2004~2021</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>
+		<PackageReleaseNotes>
+			v0.1 创世
+		</PackageReleaseNotes>
+		<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
+
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
 		<PackageReference Include="Senparc.NeuChar" Version="2.0.1" />
 		<PackageReference Include="System.Windows.Extensions" Version="5.0.0" />
 	</ItemGroup>