From 6083f34dbf68738a8a93bb2f6ce800fee603d160 Mon Sep 17 00:00:00 2001 From: Darren Date: Mon, 24 Aug 2020 16:18:44 +0800 Subject: [PATCH 01/25] proto add csharp namespace --- proto/wechaty/puppet/base.proto | 1 + proto/wechaty/puppet/contact.proto | 1 + proto/wechaty/puppet/event.proto | 1 + proto/wechaty/puppet/friendship.proto | 1 + proto/wechaty/puppet/message.proto | 1 + proto/wechaty/puppet/room.proto | 1 + proto/wechaty/puppet/room_invitation.proto | 1 + proto/wechaty/puppet/room_member.proto | 1 + proto/wechaty/puppet/tag.proto | 1 + 9 files changed, 9 insertions(+) diff --git a/proto/wechaty/puppet/base.proto b/proto/wechaty/puppet/base.proto index 440d9857..41eb6a06 100644 --- a/proto/wechaty/puppet/base.proto +++ b/proto/wechaty/puppet/base.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; enum PayloadType { PAYLOAD_TYPE_UNKNOWN = 0; diff --git a/proto/wechaty/puppet/contact.proto b/proto/wechaty/puppet/contact.proto index 098e90c8..c92aa8ef 100644 --- a/proto/wechaty/puppet/contact.proto +++ b/proto/wechaty/puppet/contact.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; import "google/protobuf/wrappers.proto"; diff --git a/proto/wechaty/puppet/event.proto b/proto/wechaty/puppet/event.proto index 5521524e..b3aa6f96 100644 --- a/proto/wechaty/puppet/event.proto +++ b/proto/wechaty/puppet/event.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; enum EventType { EVENT_TYPE_UNSPECIFIED = 0; diff --git a/proto/wechaty/puppet/friendship.proto b/proto/wechaty/puppet/friendship.proto index 15494ade..5043f541 100644 --- a/proto/wechaty/puppet/friendship.proto +++ b/proto/wechaty/puppet/friendship.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; import "google/protobuf/wrappers.proto"; diff --git a/proto/wechaty/puppet/message.proto b/proto/wechaty/puppet/message.proto index a3a9a503..af398e95 100644 --- a/proto/wechaty/puppet/message.proto +++ b/proto/wechaty/puppet/message.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; import "google/protobuf/wrappers.proto"; diff --git a/proto/wechaty/puppet/room.proto b/proto/wechaty/puppet/room.proto index e66ebe84..c79e8dba 100644 --- a/proto/wechaty/puppet/room.proto +++ b/proto/wechaty/puppet/room.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; import "google/protobuf/wrappers.proto"; diff --git a/proto/wechaty/puppet/room_invitation.proto b/proto/wechaty/puppet/room_invitation.proto index 7f2df8b1..db7f807c 100644 --- a/proto/wechaty/puppet/room_invitation.proto +++ b/proto/wechaty/puppet/room_invitation.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; import "google/protobuf/wrappers.proto"; diff --git a/proto/wechaty/puppet/room_member.proto b/proto/wechaty/puppet/room_member.proto index 4b2e34a6..a29b7d9f 100644 --- a/proto/wechaty/puppet/room_member.proto +++ b/proto/wechaty/puppet/room_member.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; message RoomMemberPayloadRequest { string id = 1; diff --git a/proto/wechaty/puppet/tag.proto b/proto/wechaty/puppet/tag.proto index 72207686..e9a42ab4 100644 --- a/proto/wechaty/puppet/tag.proto +++ b/proto/wechaty/puppet/tag.proto @@ -3,6 +3,7 @@ package wechaty.puppet; option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; option java_package="io.github.wechaty.grpc.puppet"; +option csharp_namespace = "github.wechaty.grpc.puppet"; import "google/protobuf/wrappers.proto"; From 2a7e890c89ed60333001669a4498496bb0ea153e Mon Sep 17 00:00:00 2001 From: Darren Date: Mon, 24 Aug 2020 18:08:24 +0800 Subject: [PATCH 02/25] add csharp solution --- .gitignore | 7 +++++ csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 0 -> 46592 bytes csharp/Wechaty.Grpc/Wechaty.Grpc.csproj | 17 ++++++++++++ csharp/Wechaty.Grpc/Wechaty.Grpc.sln | 25 ++++++++++++++++++ csharp/Wechaty.Grpc/nupkg/build.ps1 | 6 +++++ csharp/Wechaty.Grpc/nupkg/common.ps1 | 6 +++++ csharp/Wechaty.Grpc/nupkg/copy.ps1 | 20 ++++++++++++++ csharp/Wechaty.Grpc/nupkg/publish.ps1 | 24 +++++++++++++++++ 8 files changed, 105 insertions(+) create mode 100644 csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo create mode 100644 csharp/Wechaty.Grpc/Wechaty.Grpc.csproj create mode 100644 csharp/Wechaty.Grpc/Wechaty.Grpc.sln create mode 100644 csharp/Wechaty.Grpc/nupkg/build.ps1 create mode 100644 csharp/Wechaty.Grpc/nupkg/common.ps1 create mode 100644 csharp/Wechaty.Grpc/nupkg/copy.ps1 create mode 100644 csharp/Wechaty.Grpc/nupkg/publish.ps1 diff --git a/.gitignore b/.gitignore index c9be0e5f..6ade1115 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,10 @@ target/ # Python python/src/ + +# csharp +csharp/Wechaty.Grpc/.vs/ +csharp/Wechaty.Grpc/proto +csharp/Wechaty.Grpc/obj/ +csharp/Wechaty.Grpc/bin/ +csharp/Wechaty.Grpc/nupkg/package/ diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..cc8d8b91d7c12ebacc2defab46cbcd2f43d16239 GIT binary patch literal 46592 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 literal 0 HcmV?d00001 diff --git a/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj b/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj new file mode 100644 index 00000000..6ccdb6de --- /dev/null +++ b/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj @@ -0,0 +1,17 @@ + + + + netstandard2.1 + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/csharp/Wechaty.Grpc/Wechaty.Grpc.sln b/csharp/Wechaty.Grpc/Wechaty.Grpc.sln new file mode 100644 index 00000000..7c008a34 --- /dev/null +++ b/csharp/Wechaty.Grpc/Wechaty.Grpc.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30225.117 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wechaty.Grpc", "Wechaty.Grpc.csproj", "{71241DF7-C770-45CC-9FEA-AF6A09CA96FC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {71241DF7-C770-45CC-9FEA-AF6A09CA96FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71241DF7-C770-45CC-9FEA-AF6A09CA96FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71241DF7-C770-45CC-9FEA-AF6A09CA96FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71241DF7-C770-45CC-9FEA-AF6A09CA96FC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {56949C51-6758-44D0-8503-0729A013F881} + EndGlobalSection +EndGlobal diff --git a/csharp/Wechaty.Grpc/nupkg/build.ps1 b/csharp/Wechaty.Grpc/nupkg/build.ps1 new file mode 100644 index 00000000..5bb1f045 --- /dev/null +++ b/csharp/Wechaty.Grpc/nupkg/build.ps1 @@ -0,0 +1,6 @@ +. ".\common.ps1" + + +$solutionFolder = Join-Path $rootFolder $solution + Set-Location $solutionFolder + & dotnet restore diff --git a/csharp/Wechaty.Grpc/nupkg/common.ps1 b/csharp/Wechaty.Grpc/nupkg/common.ps1 new file mode 100644 index 00000000..a6cf4c64 --- /dev/null +++ b/csharp/Wechaty.Grpc/nupkg/common.ps1 @@ -0,0 +1,6 @@ + + +$packFolder = (Get-Item -Path "./" -Verbose).FullName +$rootFolder = Join-Path $packFolder "../../../" + +echo $packFolder diff --git a/csharp/Wechaty.Grpc/nupkg/copy.ps1 b/csharp/Wechaty.Grpc/nupkg/copy.ps1 new file mode 100644 index 00000000..ed6a5473 --- /dev/null +++ b/csharp/Wechaty.Grpc/nupkg/copy.ps1 @@ -0,0 +1,20 @@ + +# copy wechaty grpc proto to csharp solution + +$currentFolder = (Get-Item -Path "./" -Verbose).FullName + +$projectFolder=(Get-Item -Path "../../../" -Verbose).FullName + + +if(Test-Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto") +{ + Remove-Item -Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto" -Recurse -Force +} + +Copy-Item "C:\Darren\github\wechaty\grpc\proto" "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\" -Recurse + + + + + + diff --git a/csharp/Wechaty.Grpc/nupkg/publish.ps1 b/csharp/Wechaty.Grpc/nupkg/publish.ps1 new file mode 100644 index 00000000..44b794ae --- /dev/null +++ b/csharp/Wechaty.Grpc/nupkg/publish.ps1 @@ -0,0 +1,24 @@ + + + + + +$currentFolder = (Get-Item -Path "./" -Verbose).FullName + +$projectFolder=(Get-Item -Path "../../../" -Verbose).FullName + + + + +if(Test-Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto") +{ + Remove-Item -Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto" -Recurse -Force +} + +Copy-Item "C:\Darren\github\wechaty\grpc\proto" "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\" -Recurse + + + + + + From 1d1de76c81c5d0c8342c0e163c43d4af93a2a7b9 Mon Sep 17 00:00:00 2001 From: zhengbo Date: Wed, 26 Aug 2020 23:27:29 +0800 Subject: [PATCH 03/25] update --- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 46592 -> 49152 bytes csharp/Wechaty.Grpc/Wechaty.Grpc.csproj | 4 +++- csharp/Wechaty.Grpc/nupkg/common.ps1 | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index cc8d8b91d7c12ebacc2defab46cbcd2f43d16239..58b4474c6631dc1773d2addd3c8bdade5095f47b 100644 GIT binary patch literal 49152 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 MyEbRFS^3xh1I@f^qW}N^ delta 6063 zcmeGgYiyg<_4^z`G-=u^$w*Y3$I_ zbUy~DP^b@@#H4{3dr%g!7BdMdF*1QPU|ZQF*8Q7c8k#1diA_PG+kl<(*>0VZN<}=h zA6)Bv_uO;t>pbo`_j+xuXzc^uW4&zg<-XlKwiN1lb-O-X>M!{;b&aiN7-pjeR(TdN zdkAqp!e>~Zyu6VO!AHC^#rGnqtO!<%tRfMj%>_NgN3jtQ;0Mc2VEL6SADn{9bSXbj zh9sJ4Z>}c13h_z=F+wRq1wuK(T?l&+Y7p*5puYFyYFfSyVLw6x0`a`L8Xn_Uu|2fn zg$X5mzz>v_^avYV?e*_|WqAVSHmTIyA0`eo zim96)8v%qMJYBk&TSAy$0+J18Zgx5Lpx*G?hJE{cu+fXqhd?qDLzAnyPQnAqMndv1 zg3Q}&qL>;=-7jTQl~z{F?m)c0aPVfCotA(^xm!pxQlU|>S?++>CB3j#@w%uD zM^JRhGX>m~kg6OMQLrg4WRVC$G=o*lQZPDDz$+$uy_>ZKsr(jO*u`u+Qt5o(Scpt; z8)J}L-7rR(o}@^J`H(Cd6tgt`HexzN6rm{w<`;oY3F<)B2WxFfb_lMwS+g2xcMJCy zbQ4gZ;luU2vTP|2*V<#_e78^mnaw>Sb~_{4(L#Oc>eoO&)d3$@+rZ#gvOY-Fpr#Jv z)CUXJf(;X&6~Xm`xvd;}J8QZ^hlj*ryO^OfPYK|rFozu?is}?+^2AJ{=@AxQHi==E z?gcjm5;~}~>rdX7)Vy`z^rf)8N!NTZ^^3a4j|XLlk1L*^ymI9?N7@jd2}k|}7ylTj zM*QFZ`O7;n_{&NO;^)E(>CEY;&i`80q(hf!&1m!+ymT8{g3~2>a6fq%w5Aa@;se~cExhQo72$tV~JBg3D8ks_wWK%&2{ieuVFy4O(-dt~LK6UCol}@3O<4@8lm&$3ROrlbC zNpYl9YEpG|bg2#U(?5f=V>-US`&a;ew_Xb?kJN(W89BTDIr5I^^3+@;9)@;kWuLp1 zJ;?t2R#Fvw*VoHlyp>!F&pp`R^G%7jJ2P>-m4#PMNO=k=8nGFzBmc6iEACXerESxZ zL}YqlaVZFItTz+zUJ}5>`6thqR3oDdUxhh``OeS5@kWVZ1xpim!p47_h zlrpqp_RY8w!Jyw_7S!%PmWE-{By&~&V|ViZ*XB~a3(S5S#Xc7_C8V!Eu?x>+x#MUZ2A`X_)FzhuT+Ewn)qz49lV?2WIt?j?S1) zmGUje7nAeL!{c4Pd5cA9SDzeMHkz!e&c*n$Vazof9dl~2=&Y{M4&&0Sb$WWbkFKg) zN;Sh`;HK+PzR(ST(w$-31Kh{zFbdoY*P!tRb~Sy-z-7oSX)|#sdod_Xo3MH4Z7xjG zt%(npO?Q3W`P0lV$b^0A%T0HZ%XVNSz9p9l3Ub-;qA#4w(#{IXV_@)B!~LF$Z#GHw zLcNd6LzXsX8n5o(W`eIY(S0qMpy^ICK|cI{n*zQ~0beEsNb~U@Yx?trBJ>@mfXp=r z@Js3OL&d<|@G|XBeXr;i+Lp^;;jK@+Gj|1Si^gU8Tz;t)ZAZ)x%bb1k0Q(hBC}5w_ z{FwL5iAQ-E%}?vuQc?jG!}d2&_(QU)+^Fw9W|&-B3N9SO8(DaHDs$q((K{N-8gqhH zL0zhHYYWb#?4|UV9Q`d|_}ra%6kj#jBwP!k^CdT1nNv?%_@(p)p*O!_+bgoPROnxf zrbyMA+${S*^F%SbrIk7VgodxCgieLFLbGN|gh?c-24%hvC^DsW*o z^XjEIo2htN$zy+nkDfj#%jiHe+6Wcv--o~cV4v{VO3)vkOr+rVQ2T$YPw^Ig;sfn4 ztUdd$+lh6Jw~zj{5YWqfi?4uVzY)WI4?K9cyzH}|Tz%^7@zCQZ|Mo<%X5*nca2||8 jnfVChGzYI<(q{EvVQ$LnzJ%ud!t=&q;$Q&wm)HCc7s!%g diff --git a/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj b/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj index 6ccdb6de..71eec698 100644 --- a/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj +++ b/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj @@ -12,6 +12,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + + + diff --git a/csharp/Wechaty.Grpc/nupkg/common.ps1 b/csharp/Wechaty.Grpc/nupkg/common.ps1 index a6cf4c64..9d4a2fc9 100644 --- a/csharp/Wechaty.Grpc/nupkg/common.ps1 +++ b/csharp/Wechaty.Grpc/nupkg/common.ps1 @@ -4,3 +4,9 @@ $packFolder = (Get-Item -Path "./" -Verbose).FullName $rootFolder = Join-Path $packFolder "../../../" echo $packFolder + + +https://www.jb51.net/article/53528.htm +https://www.pstips.net/powershell-replace-text.html +https://www.jb51.net/article/32470.htm +https://www.jb51.net/article/53528.htm From 704a3133213536269c933af79367de3dd0ee9c03 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 14:03:11 +0800 Subject: [PATCH 04/25] csharp add build powshell --- .gitignore | 1 + csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 46592 -> 51200 bytes csharp/Wechaty.Grpc/Wechaty.Grpc.csproj | 7 ++-- csharp/Wechaty.Grpc/buildTool/build.ps1 | 26 +++++++++++++++ csharp/Wechaty.Grpc/buildTool/common.ps1 | 23 +++++++++++++ csharp/Wechaty.Grpc/buildTool/copy.ps1 | 31 ++++++++++++++++++ csharp/Wechaty.Grpc/buildTool/publish.ps1 | 13 ++++++++ csharp/Wechaty.Grpc/common.props | 19 +++++++++++ csharp/Wechaty.Grpc/nupkg/build.ps1 | 6 ---- csharp/Wechaty.Grpc/nupkg/common.ps1 | 6 ---- csharp/Wechaty.Grpc/nupkg/copy.ps1 | 20 ----------- csharp/Wechaty.Grpc/nupkg/publish.ps1 | 24 -------------- 12 files changed, 118 insertions(+), 58 deletions(-) create mode 100644 csharp/Wechaty.Grpc/buildTool/build.ps1 create mode 100644 csharp/Wechaty.Grpc/buildTool/common.ps1 create mode 100644 csharp/Wechaty.Grpc/buildTool/copy.ps1 create mode 100644 csharp/Wechaty.Grpc/buildTool/publish.ps1 create mode 100644 csharp/Wechaty.Grpc/common.props delete mode 100644 csharp/Wechaty.Grpc/nupkg/build.ps1 delete mode 100644 csharp/Wechaty.Grpc/nupkg/common.ps1 delete mode 100644 csharp/Wechaty.Grpc/nupkg/copy.ps1 delete mode 100644 csharp/Wechaty.Grpc/nupkg/publish.ps1 diff --git a/.gitignore b/.gitignore index 6ade1115..515df4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ csharp/Wechaty.Grpc/proto csharp/Wechaty.Grpc/obj/ csharp/Wechaty.Grpc/bin/ csharp/Wechaty.Grpc/nupkg/package/ +*.nupkg diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index cc8d8b91d7c12ebacc2defab46cbcd2f43d16239..d05789dc3a1dce59a132569e7822235076cf3cec 100644 GIT binary patch literal 51200 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 + netstandard2.1 + @@ -12,6 +13,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + + + diff --git a/csharp/Wechaty.Grpc/buildTool/build.ps1 b/csharp/Wechaty.Grpc/buildTool/build.ps1 new file mode 100644 index 00000000..6d318ebf --- /dev/null +++ b/csharp/Wechaty.Grpc/buildTool/build.ps1 @@ -0,0 +1,26 @@ +. ".\common.ps1" + +Set-Location $solutionFolder + +$releasePath = Join-Path $solutionFolder "bin/Release" +if(Test-Path $releasePath) +{ + Remove-Item -Recurse $releasePath +} + +# update common.props version as package.json version +$commonPropPath = Join-Path $solutionFolder "common.props" +$commonPropsData = Get-Content $commonPropPath + +$versionNode="" + $version + "" +$commonPropsData -Replace "(.*)" , $versionNode | set-Content $commonPropPath + +dotnet restore +& dotnet msbuild /t:pack /p:Configuration=Release /p:SourceLinkCreate=true + + +# from bin\Release to nupkg catalog +$nugetPackagePath = Join-Path $solutionFolder ("/bin/Release/Wechaty.Grpc.*.nupkg") +Move-Item $nugetPackagePath $packageFolder + +Set-Location $buildFolder diff --git a/csharp/Wechaty.Grpc/buildTool/common.ps1 b/csharp/Wechaty.Grpc/buildTool/common.ps1 new file mode 100644 index 00000000..41fcaa41 --- /dev/null +++ b/csharp/Wechaty.Grpc/buildTool/common.ps1 @@ -0,0 +1,23 @@ +# Paths + +# csharp build Folder +$buildFolder = (Get-Item -Path "./" -Verbose).FullName + +# wechaty root folder +$rootFolder = Join-Path $packFolder "../../../" + +# wechaty proto folder +$wechatyProtoFolder=Join-Path $rootFolder "proto" + +# chsarp solution Folder +$solutionFolder = Join-Path $rootFolder "csharp/Wechaty.Grpc" + +# nuget package Folder +$packageFolder=Join-Path $solutionFolder "nupkg" + +# get package.json data +$packageData=Get-Content (Join-Path $rootFolder "package.json") | ConvertFrom-Json + +# get package.json version +$version=($packageData | Select-Object -Property version).version + diff --git a/csharp/Wechaty.Grpc/buildTool/copy.ps1 b/csharp/Wechaty.Grpc/buildTool/copy.ps1 new file mode 100644 index 00000000..a1275782 --- /dev/null +++ b/csharp/Wechaty.Grpc/buildTool/copy.ps1 @@ -0,0 +1,31 @@ +. ".\common.ps1" + + +# Get-ChildItem $projectFolder | ?{$_.psiscontainer -eq $false} + + +# csharp wechaty proto folder +$csharpProtoFolder=Join-Path $solutionFolder "proto" + +# if csharp proto folder is exists, delete if exists +if(Test-Path $csharpProtoFolder) +{ + Remove-Item -Path $csharpProtoFolder -Recurse -Force +} + +# copy wechaty proto folder to csharp proto folder +Copy-Item $wechatyProtoFolder $solutionFolder -Recurse + +$puppetFilePath = Join-Path $csharpProtoFolder "wechaty/puppet.proto" +# get puppet.proto content +$file = Get-Content $puppetFilePath + +# update import as csharp catalog +$file.Replace("import public `"puppet/","import public `"proto/wechaty/puppet/") | set-Content $puppetFilePath + +Set-Location $buildFolder + + + + + diff --git a/csharp/Wechaty.Grpc/buildTool/publish.ps1 b/csharp/Wechaty.Grpc/buildTool/publish.ps1 new file mode 100644 index 00000000..b5e8f2e6 --- /dev/null +++ b/csharp/Wechaty.Grpc/buildTool/publish.ps1 @@ -0,0 +1,13 @@ +. ".\common.ps1" + +$apiKey = $args[0] + +echo $apiKey + +Write-Output $apiKey; + +$packageFile=Join-Path $packageFolder ("Wechaty.Grpc."+ $version + ".nupkg") + +dotnet nuget push $packageFile -s https://api.nuget.org/v3/index.json --api-key "$apiKey" + +Set-Location $buildFolder \ No newline at end of file diff --git a/csharp/Wechaty.Grpc/common.props b/csharp/Wechaty.Grpc/common.props new file mode 100644 index 00000000..4f9617c8 --- /dev/null +++ b/csharp/Wechaty.Grpc/common.props @@ -0,0 +1,19 @@ + + + netstandard2.1 + latest + 0.17.3 + Darren + Darren + wechaty grpc + $(NoWarn);CS1591 + https://wechaty.js.org/img/wechaty-icon.svg + https://github.com/Chatie/grpc + Apache-2.0 + git + https://github.com/Chatie/grpc + + + + + diff --git a/csharp/Wechaty.Grpc/nupkg/build.ps1 b/csharp/Wechaty.Grpc/nupkg/build.ps1 deleted file mode 100644 index 5bb1f045..00000000 --- a/csharp/Wechaty.Grpc/nupkg/build.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -. ".\common.ps1" - - -$solutionFolder = Join-Path $rootFolder $solution - Set-Location $solutionFolder - & dotnet restore diff --git a/csharp/Wechaty.Grpc/nupkg/common.ps1 b/csharp/Wechaty.Grpc/nupkg/common.ps1 deleted file mode 100644 index a6cf4c64..00000000 --- a/csharp/Wechaty.Grpc/nupkg/common.ps1 +++ /dev/null @@ -1,6 +0,0 @@ - - -$packFolder = (Get-Item -Path "./" -Verbose).FullName -$rootFolder = Join-Path $packFolder "../../../" - -echo $packFolder diff --git a/csharp/Wechaty.Grpc/nupkg/copy.ps1 b/csharp/Wechaty.Grpc/nupkg/copy.ps1 deleted file mode 100644 index ed6a5473..00000000 --- a/csharp/Wechaty.Grpc/nupkg/copy.ps1 +++ /dev/null @@ -1,20 +0,0 @@ - -# copy wechaty grpc proto to csharp solution - -$currentFolder = (Get-Item -Path "./" -Verbose).FullName - -$projectFolder=(Get-Item -Path "../../../" -Verbose).FullName - - -if(Test-Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto") -{ - Remove-Item -Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto" -Recurse -Force -} - -Copy-Item "C:\Darren\github\wechaty\grpc\proto" "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\" -Recurse - - - - - - diff --git a/csharp/Wechaty.Grpc/nupkg/publish.ps1 b/csharp/Wechaty.Grpc/nupkg/publish.ps1 deleted file mode 100644 index 44b794ae..00000000 --- a/csharp/Wechaty.Grpc/nupkg/publish.ps1 +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -$currentFolder = (Get-Item -Path "./" -Verbose).FullName - -$projectFolder=(Get-Item -Path "../../../" -Verbose).FullName - - - - -if(Test-Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto") -{ - Remove-Item -Path "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\proto" -Recurse -Force -} - -Copy-Item "C:\Darren\github\wechaty\grpc\proto" "C:\Darren\github\wechaty\grpc\csharp\Wechaty.Grpc\" -Recurse - - - - - - From 81b528a7f2736c5c39f20b449f37351e8c2eca53 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 14:29:53 +0800 Subject: [PATCH 05/25] Create csharp.yml --- .github/workflows/csharp.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/csharp.yml diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml new file mode 100644 index 00000000..fb7ce3eb --- /dev/null +++ b/.github/workflows/csharp.yml @@ -0,0 +1,24 @@ +name: "build and push nuget package" +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] +jobs: + build-test: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@master + with: + dotnet-version: 3.1.100 + + - name: copy wechaty proto + run: .\copy.ps1 + working-directory: .\buildTool + shell: powershell + + - name: build and create nuget package + run: .\build.ps1 + working-directory: .\buildTool + shell: powershell From 3d74dc938c749326e268b835761f1088e3d2f7c7 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 14:36:53 +0800 Subject: [PATCH 06/25] update csharp.yaml --- .github/workflows/csharp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index fb7ce3eb..5b147c49 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -15,10 +15,10 @@ jobs: - name: copy wechaty proto run: .\copy.ps1 - working-directory: .\buildTool + working-directory: .\csharp\Wechaty.Grpc\buildTool shell: powershell - name: build and create nuget package run: .\build.ps1 - working-directory: .\buildTool + working-directory: .\csharp\Wechaty.Grpc\buildTool shell: powershell From ea2592d9048e83a7131da7c196528d94c8c62071 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 14:40:21 +0800 Subject: [PATCH 07/25] update copy.ps1 --- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 51200 -> 53248 bytes csharp/Wechaty.Grpc/buildTool/copy.ps1 | 1 + 2 files changed, 1 insertion(+) diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index d05789dc3a1dce59a132569e7822235076cf3cec..9f87162732dff50122d8f558522d942d7d9d2650 100644 GIT binary patch delta 4735 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 QKkJ0f+BK+MMtX4VpNNsqaR2}S delta 2734 zcmdT`eN0nV6o2>82Ty2g;eiuGETxnR0`&t$L@7$<#~e^4s7t3s8ftS^5hi9HME$aA&rJ>Pf zhTZ&Xftj!k_XcBOrZk-$hev#uFcVFCp*?JmW)ZfAr{F&n0hmfEOvM&1?Ikw}L2*<8 z8`)E^9T(D{hV9vih=5H4O`_yT4D`|inmmI-;Y5THVL)gR$%q&P&B;I=jmQl2vjf_K zx(u-d;kFqQ^HDEF6d=g2Fre3>cH7MM;y}Lybt%GzSch1Tpi^x?O@13umm@YIUP8Q# zAUla8q`fuJPC)IpIX!%xR`+vy!R%+?J1&%Oe*~|0D)HV$e3ONCMnc?&BZ7R>y%5i_ z2pT88X|5*FCtFbdiTx<_d4l~+4s*-5@c)JWNS87YX=QGQ)uUUXVN?gfyo6}U$QDA2 zu8ZZsBVDn;a&dIL2o^v~beEdQL#t0bA&aT6t0~`!BjS_Rf>Cv;ii$3{M0gu^E-=`w zS)-;j4GWnpP`;^@vFJ4nuJLo32rW{HN{_~%H;hViKyNaOl;z_woTd?xQv0zXt%Md3 zj-c^4j3uWfQsq$n)85nwx_hb~Itt_)7J%NMQYE1Q+6+b=St(;k)1|_P2ECCwp&()w zBk~Xwor(&6G5nySNpLSk-ygHWcMgF{wg=j!7bcuVpn2SXwYyr89uVAt|C*eZVKwnF zV}dc&N24-2w}fdJozpyFc=ntBK7SNz^-`v)uBdAUS4|;w*DPc6;A%|)7_zNk9U73b z>zlW>Y_HpvJvQtiWOL+P-eX!dAr%#;390g>1hF|D)|ZGB6UE0F zjXX=u`IAK%%ZcFo%|%R2{!dYIqd@ccY>sM>Iso19Mqv`%~TvsMiEd&h$ z)nF^MC+}ey@aV<$A{9w+P;nNQF){QYf)j^NDP!{^_}K9LS6b@omZ4!>%y=_NP~RHq zqqSh@HQno;Uq4uPS~ttyf7M;@HeH5_%W?2vC@J21YUsW0&DDonA0DZSAJ{*u0T&Sv zN8!%tG`d{5Nc*(hP%t-mxm@Kby*1_cKOT%E)qEwT!u`!lA;$KTZ0DcmL-`~-!uxBJ z!@$VvqHDPd&dIfNS=>r)7uUF*S9*4S%fM}~hMjg()CJrIy@?3uwby{nK0P{%tK^!w zMx5Tj?eL8hZ%TmS`tqnu&Jy^`1n-s&V0FYox?`H+aMt1QhG7j)Cw>Jd_4v0#|-mjTrd;2V} z+&%P}0NK2#l)V40pfnzQhfxo#r7DpUh6I`pXOU4`bb%G+S@JgCriA3c)-(%D6$#*~ zG{Y^&bQW`heS|;U%BR51)4wUMb1o(ye1FXl uMHlb?vBrV>QjSPpHQ$%b&(uaXp8fO@e!xJPN>P3OC;J Date: Thu, 27 Aug 2020 14:45:18 +0800 Subject: [PATCH 08/25] add test --- .github/workflows.rar | Bin 0 -> 4714 bytes .github/workflows/csharp.yml | 4 +- .github/workflows/go.yml | 62 -------------- .github/workflows/maven-publish.yml | 30 ------- .github/workflows/maven.yml | 24 ------ .github/workflows/node.js.yml | 49 ------------ .github/workflows/npm.yml | 98 ----------------------- .github/workflows/php.yml | 40 --------- .github/workflows/pypi.yml | 93 --------------------- csharp/Wechaty.Grpc/buildTool/common.ps1 | 3 + 10 files changed, 5 insertions(+), 398 deletions(-) create mode 100644 .github/workflows.rar delete mode 100644 .github/workflows/go.yml delete mode 100644 .github/workflows/maven-publish.yml delete mode 100644 .github/workflows/maven.yml delete mode 100644 .github/workflows/node.js.yml delete mode 100644 .github/workflows/npm.yml delete mode 100644 .github/workflows/php.yml delete mode 100644 .github/workflows/pypi.yml diff --git a/.github/workflows.rar b/.github/workflows.rar new file mode 100644 index 0000000000000000000000000000000000000000..efcb2276cf24796dba3fc57548de2920101503e4 GIT binary patch literal 4714 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 bva!h5s_qJL%(_!|77Ty~p(X|(Trl8&STwg{ literal 0 HcmV?d00001 diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 5b147c49..f6e62046 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -1,11 +1,11 @@ -name: "build and push nuget package" +name: "csharp" on: push: branches: [ master ] pull_request: branches: [ master ] jobs: - build-test: + build-push: runs-on: windows-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml deleted file mode 100644 index 2404b2b8..00000000 --- a/.github/workflows/go.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Go - -on: [push, pull_request] - -jobs: - - build: - name: Build - runs-on: ubuntu-latest - steps: - - - name: Set up Go 1.14 - uses: actions/setup-go@master - with: - stable: false - go-version: 1.14 - id: go - - name: Install Protoc - uses: arduino/setup-protoc@master - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - cd go - make install - - - name: Build - run: | - cd go - make generate - go build -v generated/wechaty/puppet.pb.go - - publish: - if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v')) - name: Publish - needs: [build] - runs-on: ubuntu-latest - steps: - - name: Set up Go 1.14 - uses: actions/setup-go@master - with: - stable: false - go-version: 1.14 - id: go - - name: Install Protoc - uses: arduino/setup-protoc@master - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - name: Deploy - run: | - cd go - make install - # https://stackoverflow.com/a/4565746/1123955 - # https://stackoverflow.com/a/46253163/1123955 - ssh-agent bash -c "\ - echo '${SSH_PRIVATE_KEY}' | ssh-add - ;\ - make publish ;\ - " - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml deleted file mode 100644 index 02dccee8..00000000 --- a/.github/workflows/maven-publish.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path - -name: Maven Package - -on: - release: - types: [created] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Maven - run: mvn -B package --file java/pom.xml - - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml - env: - GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index db8eb4e7..00000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,24 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Maven - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Maven - run: mvn -B package --file java/pom.xml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml deleted file mode 100644 index fb525670..00000000 --- a/.github/workflows/node.js.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions - -name: Node.js - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - strategy: - matrix: - os: [macos-latest, ubuntu-latest] - node-version: [10.x, 11.x, 12.x] - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Set up Go 1.14 - uses: actions/setup-go@master - with: - stable: false - go-version: 1.14 - id: go - - - name: Install Protoc - uses: arduino/setup-protoc@master - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - - name: Install Dependencies - run: | - npm install - npm run install:lint:protoc - - - name: Generate gRPC Stubs - run: npm run generate - - - name: Test - run: npm test - env: - CI: true diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml deleted file mode 100644 index 7d633923..00000000 --- a/.github/workflows/npm.yml +++ /dev/null @@ -1,98 +0,0 @@ -name: NPM - -on: [push, pull_request] - -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Use Node.js 12 - uses: actions/setup-node@v1 - with: - node-version: 12 - - name: Set up Go 1.14 - uses: actions/setup-go@master - with: - stable: false - go-version: 1.14 - id: go - - name: Install Protoc - uses: arduino/setup-protoc@master - - - name: Install Dependencies - run: | - npm install - npm run install:lint:protoc - - - name: Generate gRPC Stubs - run: npm run generate - - - name: Test - run: npm test - - pack: - name: Pack - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: 12 - - - name: Install Protoc - uses: arduino/setup-protoc@master - - - name: Install Dependencies - run: npm install - - - name: Generate Version - run: ./scripts/generate-version.sh - - - name: Pack Testing - run: ./scripts/npm-pack-testing.sh - - publish: - if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v')) - name: Publish - needs: [build, pack] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: 12 - registry-url: https://registry.npmjs.org/ - - name: Install Protoc - uses: arduino/setup-protoc@master - - - name: Install Dependencies - run: npm install - - name: Generate Version - run: ./scripts/generate-version.sh - - name: Set Publish Config - run: ./scripts/package-publish-config-tag.sh - - run: npm run dist - - - name: Check Branch - id: check-branch - run: | - if [[ ${{ github.ref }} =~ ^refs/heads/(master|v[0-9]+\.[0-9]+.*)$ ]]; then - echo ::set-output name=match::true - fi # See: https://stackoverflow.com/a/58869470/1123955 - - name: Is A Publish Branch - if: steps.check-branch.outputs.match == 'true' - run: | - NAME=$(npx pkg-jq -r .name) - VERSION=$(npx pkg-jq -r .version) - if npx version-exists "$NAME" "$VERSION" - then echo "$NAME@$VERSION exists on NPM, skipped." - else npm publish - fi - env: - NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} - - name: Is Not A Publish Branch - if: steps.check-branch.outputs.match != 'true' - run: echo 'Not A Publish Branch' diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml deleted file mode 100644 index aec31ec5..00000000 --- a/.github/workflows/php.yml +++ /dev/null @@ -1,40 +0,0 @@ -# For more information see: https://docs.github.com/en/actions/getting-started-with-github-actions -# For more setup-php see: https://github.com/shivammathur/setup-php -# For more setup-php protoc see: https://github.com/shivammathur/setup-php/issues/262 - -name: PHP - -on: [push, pull_request] - -jobs: - run: - name: Run - runs-on: ${{ matrix.operating-system }} - strategy: - fail-fast: false - matrix: - operating-system: [ubuntu-20.04] - php-versions: ['7.4'] - env: - extensions: xml, opcache, xdebug, pcov, grpc-1.30.0, protobuf-3.12.2 - key: cache-v3 - - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup PHP with extensions and custom config - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - extensions: ${{ env.extensions }} - ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Shanghai - tools: protoc, grpc_php_plugin - - name: Testing PHP version - run: | - php -v - php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}" - - name: Test grpc_php_plugin and protoc - run: | - protoc --version - cd php - make generate diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml deleted file mode 100644 index c165b8aa..00000000 --- a/.github/workflows/pypi.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: PyPI - -on: [push, pull_request] - -jobs: - build: - name: Build - strategy: - matrix: - os: [ubuntu-latest] - python-version: [3.7] - - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - cd python - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements-dev.txt - - name: Test - run: | - cd python - make generate - make test - - pack: - name: Pack - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - name: Install dependencies - run: | - cd python - python -m pip install --upgrade pip - pip install setuptools wheel twine - make install - - name: Pack Testing - run: | - cd python - make generate - make dist - echo "To be add: pack testing" - - deploy: - if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v')) - name: Deploy - needs: [build, pack] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - with: - python-version: '3.7' - - name: Install dependencies - run: | - cd python - python -m pip install --upgrade pip - pip install setuptools wheel twine - - - name: Check Branch - id: check-branch - run: | - if [[ ${{ github.ref }} =~ ^refs/heads/(master|v[0-9]+\.[0-9]+.*)$ ]]; then - echo ::set-output name=match::true - fi # See: https://stackoverflow.com/a/58869470/1123955 - - - name: Is A Publish Branch - if: steps.check-branch.outputs.match == 'true' - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} - run: | - cd python - make install - make generate - make dist - python setup.py sdist bdist_wheel - twine upload --skip-existing dist/* - - - name: Is Not A Publish Branch - if: steps.check-branch.outputs.match != 'true' - run: echo 'Not A Publish Branch' diff --git a/csharp/Wechaty.Grpc/buildTool/common.ps1 b/csharp/Wechaty.Grpc/buildTool/common.ps1 index 41fcaa41..c14363c3 100644 --- a/csharp/Wechaty.Grpc/buildTool/common.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/common.ps1 @@ -1,5 +1,8 @@ # Paths +$test=$MyInvocation.MyCommand.Definition +echo $test + # csharp build Folder $buildFolder = (Get-Item -Path "./" -Verbose).FullName From a1fc7f61d4b29019224e7e4daf4b1dac7e735df4 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 15:05:46 +0800 Subject: [PATCH 09/25] test --- csharp/Wechaty.Grpc/buildTool/common.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/csharp/Wechaty.Grpc/buildTool/common.ps1 b/csharp/Wechaty.Grpc/buildTool/common.ps1 index c14363c3..78baf400 100644 --- a/csharp/Wechaty.Grpc/buildTool/common.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/common.ps1 @@ -1,11 +1,15 @@ # Paths $test=$MyInvocation.MyCommand.Definition +echo "��ǰĿ¼��ַ" echo $test # csharp build Folder $buildFolder = (Get-Item -Path "./" -Verbose).FullName +echo "build folder" +echo $buildFolder + # wechaty root folder $rootFolder = Join-Path $packFolder "../../../" From ac5254fa5ac3a30d23d3bf45add420713c5a7e52 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 15:09:24 +0800 Subject: [PATCH 10/25] update common.ps1 --- csharp/Wechaty.Grpc/buildTool/common.ps1 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/csharp/Wechaty.Grpc/buildTool/common.ps1 b/csharp/Wechaty.Grpc/buildTool/common.ps1 index 78baf400..967df2b6 100644 --- a/csharp/Wechaty.Grpc/buildTool/common.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/common.ps1 @@ -1,17 +1,10 @@ # Paths -$test=$MyInvocation.MyCommand.Definition -echo "��ǰĿ¼��ַ" -echo $test - # csharp build Folder $buildFolder = (Get-Item -Path "./" -Verbose).FullName -echo "build folder" -echo $buildFolder - # wechaty root folder -$rootFolder = Join-Path $packFolder "../../../" +$rootFolder = Join-Path $buildFolder "../../../" # wechaty proto folder $wechatyProtoFolder=Join-Path $rootFolder "proto" From efb4d90db13415a7c0bb8c2d54fccd4b93895c5d Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 15:16:35 +0800 Subject: [PATCH 11/25] test action args key --- .github/workflows/csharp.yml | 11 ++++------- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 53248 -> 53248 bytes csharp/Wechaty.Grpc/buildTool/publish.ps1 | 7 ++++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index f6e62046..15fad8ac 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -13,12 +13,9 @@ jobs: with: dotnet-version: 3.1.100 - - name: copy wechaty proto - run: .\copy.ps1 - working-directory: .\csharp\Wechaty.Grpc\buildTool - shell: powershell - - - name: build and create nuget package - run: .\build.ps1 + - name: push package + run: .\publish.ps1 working-directory: .\csharp\Wechaty.Grpc\buildTool shell: powershell + with: + args: 123456789 diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index 9f87162732dff50122d8f558522d942d7d9d2650..0adca30e85cddb8400bb563e5d7373d3c6fde3ba 100644 GIT binary patch delta 339 zcmZozz}&Ead4hog0}Kc-FbD$KOhEka|Ns9WVMZX{7`UEs@_)u$)&+X{v5uPy+4>nL zv4|vc0;Pbe{__KANgx&mVm_!CNIM6R%?rd5P%#!D%>%?jKr9Z#DL^a-#9Tlu0>rF9 zECa+KGqphUeGWm<&1s)IwWF1V9wFJmnw)v+hJKrKDrbTK@n=CvSISi3hOfIqP xS)|3Z=|mu-z}t9+7pZ$f4jLSGz4!N(`{~Jvd*?6G6PTpqu-U=p0OKNu2>^K;bA$i@ delta 385 zcmZozz}&Ead4hog69W_oFfafS1Bn0c|Ns9WQDz|C7`UEs@_)u$z5*Q0@7F3)SNKXt@VG#z>o0o9JFm7Ty!ZO)}RbgX-4C5vq1&+xIQp%GL zGa0h31FG0DIZ)brvWxVd$qCXfK-y-J7~duXXGUHIYoM$&5QFTQEGVfmxx}z%ks8w` zBcLRs4NwB)352Av|72$^+eKPTlk6M>{x3T>zcDUtO4;+7sgege1l8H0OZIca{ST Date: Thu, 27 Aug 2020 15:19:37 +0800 Subject: [PATCH 12/25] test powshell args --- .github/workflows/csharp.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 15fad8ac..3dccf380 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -14,8 +14,6 @@ jobs: dotnet-version: 3.1.100 - name: push package - run: .\publish.ps1 + run: .\publish.ps1 123456 working-directory: .\csharp\Wechaty.Grpc\buildTool shell: powershell - with: - args: 123456789 From 67fadae89b5aacf45945e632d0b8e8000049d1e5 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 15:24:30 +0800 Subject: [PATCH 13/25] test github Secrets --- .github/workflows/csharp.yml | 5 +---- csharp/Wechaty.Grpc/buildTool/publish.ps1 | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 3dccf380..d4e0ee84 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -9,11 +9,8 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@master - with: - dotnet-version: 3.1.100 - name: push package - run: .\publish.ps1 123456 + run: .\publish.ps1 ${{ secrets.NUGET_APIKEY }} working-directory: .\csharp\Wechaty.Grpc\buildTool shell: powershell diff --git a/csharp/Wechaty.Grpc/buildTool/publish.ps1 b/csharp/Wechaty.Grpc/buildTool/publish.ps1 index fd9abdde..18c88277 100644 --- a/csharp/Wechaty.Grpc/buildTool/publish.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/publish.ps1 @@ -7,6 +7,7 @@ echo $apiKey Write-Output $apiKey; + #$packageFile=Join-Path $packageFolder ("Wechaty.Grpc."+ $version + ".nupkg") #dotnet nuget push $packageFile -s https://api.nuget.org/v3/index.json --api-key "$apiKey" From dfe46184fed7f508b089ef440ee7ff5c690149b7 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 15:38:45 +0800 Subject: [PATCH 14/25] update yaml --- .github/workflows/csharp.yml | 13 +++++++++++++ csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 53248 -> 58880 bytes csharp/Wechaty.Grpc/Wechaty.Grpc.csproj | 5 ++++- csharp/Wechaty.Grpc/buildTool/publish.ps1 | 10 ++-------- package.json | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index d4e0ee84..df1a1bf9 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -9,6 +9,19 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@master + with: + dotnet-version: 3.1.100 + + - name: copy wechaty proto + run: .\copy.ps1 + working-directory: .\csharp\Wechaty.Grpc\buildTool + shell: powershell + + - name: build and create nuget package + run: .\build.ps1 + working-directory: .\csharp\Wechaty.Grpc\buildTool + shell: powershell - name: push package run: .\publish.ps1 ${{ secrets.NUGET_APIKEY }} diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index 0adca30e85cddb8400bb563e5d7373d3c6fde3ba..e8c25e776061ddd19ab7b4fd1020b8d43fbacbd1 100644 GIT binary patch delta 2399 zcmb7_eN0nV6u{qoeZ`6oEK-pwPC&rIpin_UELw^>h6+WP(^(zLSJfh41u39Zx9D8l z96ip&uPOCwQ5I^S^CK>(PeSLn-(@KrHZ8RBZ-=l1RLOph4Z_rM>>NDdKVUrA zWo<#Tu|p%mKeCBR>Zg{7t~Zd*;%MQ`Az2ZHlKPVTGR!Zhp^Qe75dn!oVi5(RL1^wc zWCIe9{EIPCQBtfllsaTOLd(GUqVy=sk+}$s$@R-cC_9Ta9ff|o2&D-rMwTEYNGb9z zLeE)HE<=_h?;$G@@>44tp|A1lw65wAej2wF?X}1{WIbZ#xN%$!Die`fqzuJAfJz3*1Ahc6VOM~syQ!i(g?{gPe1J=mEL4bkF}5MMHl!NGwk zVL&tq{D`O731|u_5*fN=BgT!U%%Du`lDkS?`Pi0`sGePe{hmej#0|^k6gGNCtv@R-CP&U5^F|f!a(k-VH z4mepNG{tm?R792{)F5njycECmKJ%!)XOLf*EVrTeI1H)_LO6;YiUghq+eF;M2|8(D zqR8;96yPllf>4vkOc#jGa};vA`F__gm6v-iF4h?DF8t}orw81}Nv~<$_h9DYZ!ahc zHO7=Vrr#r0{M~*L_1-_%6;z%)`>|A{F+MB_Pi!vpWIsUtUgK{&jXf(5f%5%0FcfBUH;(LwmDkqP)NX*&Tawv+7}H>$W@%bu-dNkPzRFs=vC&-KXj$D* zr?uBu+uPgHjkD6G>!zotEXc}rZRMf3QVr@BH?-M9X=0{?!_CdEZ7R6k7A0M6oyLYj zM!qT}bhT*2;NdBUV1)6;It@5~S<{*Vr`6YMb3$-B4F<)>f~zy($K5Se{xWz3ZaI~CwG^_;DVI}ySuQO)TFPAKg(G2ydDkTrE*`qv z^Ppc6B~!1PLDq>)kug;?slax&kZjF(^3=^1#nUgh)Sw+?MtRkgeM;oeHMcgGZ}t|EQjeP0li{{eh delta 1433 zcmZ`(ZA@EL7(VCrUUn&MSD<55q?WJ2NP!hmClqN5Mq}70AL2*=fiYclAZ&MJxD3IV zkxa5-pT#9e9O;ii%y7_?C?OH+SZ1;{qFY=XVubxdqCZS9+2RMDgGJfYlRi1;ea_qW zJm-DidwRpV-VxoPi^fhC=Sj*)ZeD{2ol#YoH9OgAl!5wXOG7jvWQ~ule717LbC@FB zADmbD+Q^X@;bcA=IN~_AbF^~UIP@GA4u#`k4iPgOInkN#G?_7`nl1SeQf!FvD7RTy zEuenskV5W$a@n;>n}yo9@crNaa$R%qwGbmjMyNGpsp%QQ5Gur+%;yJH2$k9ROnD;x zrHEHjWd1KX2&+?u{SgOoF$_lk#s*9p4H`;iBiX^JoX9pRlhT>Cdw>SxN~w_w0d&)r zBJ$dYZtEzsThf&Ob70-petj_2E;0L##n@ohvsB%+DGIcm1A#&*;1)lBLaC9a^4&)^ zc`z-Zf?~F^kCoZpphhB+AWA6o2#JbFqs;DQR@@(%X?tXemb31PUv&tz$~aaXmPNL( zc+G-_q{JvEH&(28y=Jc}dSD|UR%?6)QM-*=te=w2i7s@f99OdVsuuU+pTlgO6Pm?` zE8BNr)$*l51We%Ah@@!TxPZx)Z7|gbx0Q2CWKc9v&QreSh2@fh4lFemqpBen?uJm% zE)p#wY(5%V%0Qq+LTph6%c%X9A~o!QqxBc0OJ?&y(o8hcO>)UIk33I`I9s&d%N`OB zI$jd9!aq$>R)vh>tA35?kMz-?>jc$lhmWGK*b`G*?Gwp+y0qHI3*utx!Mj^gdEN@^ zTN9``8lvm}gZ@YXHL;PdCW@7zx_?Ogbn=T>(XtyuJOObC_Yc6?lZi`1M%doVV0AsC zlr>$*pnCBfJjPKrj>(UDU>vIsyeYvsn1;|PmAyUoH4U7!u%-`2D9)e>oo92AC#i7P z%dBwtDn--81XItPQv}OK&(N-v-Amy;?qxGK_vvU4Vy6#a<{K~E4lnkG%}{TdU|*2g^7TZD@=J+mU(Cjx z+q+>}8e%u5a&_>A>izQ%ar=}%r_x;Qsp>E9pMU@HAA5h;(Zm<&b#dMt54FPqmuqB7Hhu!qQpYi-SVF? C`2yhp diff --git a/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj b/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj index 7bbbaa52..60c33484 100644 --- a/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj +++ b/csharp/Wechaty.Grpc/Wechaty.Grpc.csproj @@ -3,7 +3,7 @@ netstandard2.1 - + @@ -16,5 +16,8 @@ + + + diff --git a/csharp/Wechaty.Grpc/buildTool/publish.ps1 b/csharp/Wechaty.Grpc/buildTool/publish.ps1 index 18c88277..ff65e36d 100644 --- a/csharp/Wechaty.Grpc/buildTool/publish.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/publish.ps1 @@ -2,14 +2,8 @@ $apiKey = $args[0] -echo "api-key" -echo $apiKey +$packageFile=Join-Path $packageFolder ("Wechaty.Grpc."+ $version + ".nupkg") -Write-Output $apiKey; - - -#$packageFile=Join-Path $packageFolder ("Wechaty.Grpc."+ $version + ".nupkg") - -#dotnet nuget push $packageFile -s https://api.nuget.org/v3/index.json --api-key "$apiKey" +dotnet nuget push $packageFile -s https://api.nuget.org/v3/index.json --api-key "$apiKey" Set-Location $buildFolder diff --git a/package.json b/package.json index 6979f492..827b85d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatie/grpc", - "version": "0.17.4", + "version": "0.17.3", "description": "gRPC for Chatie", "main": "dist/src/index.js", "typings": "dist/src/index.d.js", From fddac81351f0ac6bb00e7ccb9d81d2d86830fde8 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 15:57:12 +0800 Subject: [PATCH 15/25] update nuget package as rohith/publish-nuget@v2 --- .github/workflows/csharp.yml | 28 +++++++++++++----- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 58880 -> 58368 bytes csharp/Wechaty.Grpc/buildTool/build.ps1 | 7 ----- csharp/Wechaty.Grpc/buildTool/copy.ps1 | 8 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index df1a1bf9..b19df346 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -18,12 +18,24 @@ jobs: working-directory: .\csharp\Wechaty.Grpc\buildTool shell: powershell - - name: build and create nuget package - run: .\build.ps1 - working-directory: .\csharp\Wechaty.Grpc\buildTool - shell: powershell + - name: publish on version change + uses: rohith/publish-nuget@v2 + with: + PROJECT_FILE_PATH: .\csharp\Wechaty.Grpc\Wechaty.Grpc.csproj + NUGET_KEY: ${{ secrets.NUGET_APIKEY }} + + - - name: push package - run: .\publish.ps1 ${{ secrets.NUGET_APIKEY }} - working-directory: .\csharp\Wechaty.Grpc\buildTool - shell: powershell + +# - name: build and create nuget package +# run: .\build.ps1 +# working-directory: .\csharp\Wechaty.Grpc\buildTool +# shell: powershell + + + +# - name: push package +# run: .\publish.ps1 ${{ secrets.NUGET_APIKEY }} +# working-directory: .\csharp\Wechaty.Grpc\buildTool +# shell: powershell + diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index e8c25e776061ddd19ab7b4fd1020b8d43fbacbd1..c9f5ea118b0bc954c8e8663b1362b2e7909495a0 100644 GIT binary patch delta 489 zcmZoT!`yI!d4d5W(?mmQM&`+iEXo@bCNOSd%30kJAbZ1YAIenv(Ch*>g=xR@q!-QnB;l-UWy z|0Wx90|_TK6V~lO*{MKdyeGRz+iY@jX5?kC0SZZ@ zXmak^6mXbv@?mk?OvwH2c&Zuau`I#jf=P3 zst;R~v(&Hid8**#L|ysGI!q!m7C_xjpx_09|I5zJZ;VTuQucgis^o!A`OOm)3K%y% QIl#zRFqu);ev!%n0Q8EnasU7T delta 832 zcmYk4&1=(e7{~idld{y>Wo_m%+uAq_4t3Jud}V0as@4@ZS34QL%nEKGc#OiP;KY-- zgY6@zAP8lvf&(?#A26|pA)=lJL77-hWA+=b2vePrvuyPYYkU zJ0=9ZQIEVXS;CgC%HdBhMwYWTKa1TypD)uzQ_>)PeWz0*YKR5;DcuosH0i%_s~6$O z20U<9-4lcU+tpR*D_#IH3OfwiT|bv@1O^BIP7OguKpVIWk{}3lpny1N20Pfj2MQOh zl!te=Ot=O+_#|kn9KF&5?_RJE><1&@AUFgLgZ13?XU4VrT-gtq1xLX#a2({o2`~Wi z;3VK`d_qz=4`Ym9+qDVW88>th@{+5!x{^!Ap>GD~xcB8!XEi9<;jCyn03ZK84V&92 zEh%D_t~KAQ1ZOmE<{Tn5@QgE_1dUd9zJ&1#ux>*-&bLrfluJfclPiYln4`~y%x(1U zR4f=ZT8`zLI-qfvy%1UPA$l9=rpyJIe#P^u;Cb_}b6JUDMNsL@vZt6Rp} z6;9)9NZ5n@LKQqeo}G7x;)gLxlS2W+#`KET%Ca1fCX8TG@nbE-Ue`h>sbDe^CPE;YHE>YzvzzM hF)y^$+J~pN$0i" -$commonPropsData -Replace "(.*)" , $versionNode | set-Content $commonPropPath - dotnet restore & dotnet msbuild /t:pack /p:Configuration=Release /p:SourceLinkCreate=true diff --git a/csharp/Wechaty.Grpc/buildTool/copy.ps1 b/csharp/Wechaty.Grpc/buildTool/copy.ps1 index 9a16a9ce..5e83f22f 100644 --- a/csharp/Wechaty.Grpc/buildTool/copy.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/copy.ps1 @@ -24,6 +24,14 @@ $file = Get-Content $puppetFilePath # update import as csharp catalog $file.Replace("import public `"puppet/","import public `"proto/wechaty/puppet/") | set-Content $puppetFilePath + +# update common.props version as package.json version +$commonPropPath = Join-Path $solutionFolder "common.props" +$commonPropsData = Get-Content $commonPropPath + +$versionNode="" + $version + "" +$commonPropsData -Replace "(.*)" , $versionNode | set-Content $commonPropPath + Set-Location $buildFolder From 4ae5743238d0c3b761a99e14e3cd92a93c9b4d88 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 16:02:26 +0800 Subject: [PATCH 16/25] update version info --- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 58368 -> 58368 bytes csharp/Wechaty.Grpc/buildTool/build.ps1 | 19 +++--------------- csharp/Wechaty.Grpc/buildTool/copy.ps1 | 4 ++++ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index c9f5ea118b0bc954c8e8663b1362b2e7909495a0..82062955803b21ab7069e2ac6265924b83ac07c7 100644 GIT binary patch delta 638 zcmZoT!Q60yc|#5p>jyvM=kA*e+4>n7IVUr+h?{CNFfhmgu@Ddo0`Y$+;03ZZfLIYK zCIY1SfcPI!K7aB-R_VzZ915Bs#Vk-296*{K%2tEY!a!OT#NND-g`JTFqM2sH>tl*}>$YKo?o*by4JlTMWb#jTi|K!7LhO9Gzf(tkQ6!vD}0J#bjPzW^= z0h5oo8%+Kp;m^qklC?*YW!(d8cWO8Ej2|EkMNeT^&eUlsYD<^*n6BCf& zlq!=ekm5h=>eM*z`|>@_XM#~V#8WHF3T%uBf~=v25S)Ub(Lt=>4FwJF0|enaQ_#}e ziiYY2K{OZ|xaAbJMJ;`R8eFP#Ld65Wd(Z!KI8NQ?)P0vl5n3#Ko685!Fw;YV`(o9A zanjhtTsnyvp~0>C7C`_%f*dq{NhT>ef)82}rufBz?4OH}k7FtNEn=FGM4U(vIx#_T z_feumj1fQTO8OzRP3jJ@%dT>6-W5fyfA9QmS?!7=aCIx*8O#}Egy`pnJb>*mt&*Zu ztay+-8o?DjI?&R2v`LiInGA#Ek?P*CKz#;=puE-R1%zh`H@aj1mkv<8eFJ4jp9EIL zEZUL7>u6T$3$14D474{6y%cz{UN0@YgmBHO@qYl`rjzt#Hgq6|ugj^elOeGgS(l>A zt?ZRNNZz+ytsRqbs+wzl;bv=C6B+!Pid7$l%kH;O65n=3g%G?IeafCkgKr Qu<~AUlNEG694~Y82S`MX>;M1& diff --git a/csharp/Wechaty.Grpc/buildTool/build.ps1 b/csharp/Wechaty.Grpc/buildTool/build.ps1 index edf5a7f5..5bb1f045 100644 --- a/csharp/Wechaty.Grpc/buildTool/build.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/build.ps1 @@ -1,19 +1,6 @@ . ".\common.ps1" -Set-Location $solutionFolder -$releasePath = Join-Path $solutionFolder "bin/Release" -if(Test-Path $releasePath) -{ - Remove-Item -Recurse $releasePath -} - -dotnet restore -& dotnet msbuild /t:pack /p:Configuration=Release /p:SourceLinkCreate=true - - -# from bin\Release to nupkg catalog -$nugetPackagePath = Join-Path $solutionFolder ("/bin/Release/Wechaty.Grpc.*.nupkg") -Move-Item $nugetPackagePath $packageFolder - -Set-Location $buildFolder +$solutionFolder = Join-Path $rootFolder $solution + Set-Location $solutionFolder + & dotnet restore diff --git a/csharp/Wechaty.Grpc/buildTool/copy.ps1 b/csharp/Wechaty.Grpc/buildTool/copy.ps1 index 5e83f22f..3e3773ac 100644 --- a/csharp/Wechaty.Grpc/buildTool/copy.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/copy.ps1 @@ -30,8 +30,12 @@ $commonPropPath = Join-Path $solutionFolder "common.props" $commonPropsData = Get-Content $commonPropPath $versionNode="" + $version + "" +echo $versionNode $commonPropsData -Replace "(.*)" , $versionNode | set-Content $commonPropPath +$testdata = Get-Content $commonPropPath +echo $testdata + Set-Location $buildFolder From 3aeda42569faa159778d8c0d49d2a1e5d6e10873 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 16:09:40 +0800 Subject: [PATCH 17/25] github action add nuget VERSION_FILE_PATH --- .github/workflows/csharp.yml | 1 + csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 58368 -> 58368 bytes 2 files changed, 1 insertion(+) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index b19df346..98e96ed6 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -22,6 +22,7 @@ jobs: uses: rohith/publish-nuget@v2 with: PROJECT_FILE_PATH: .\csharp\Wechaty.Grpc\Wechaty.Grpc.csproj + VERSION_FILE_PATH: .\csharp\Wechaty.Grpc\common.props NUGET_KEY: ${{ secrets.NUGET_APIKEY }} diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index 82062955803b21ab7069e2ac6265924b83ac07c7..3684b80292941969318e09aa8455a480b98b16b6 100644 GIT binary patch delta 211 zcmZoT!Q60yc|#5pt3zy4r^n_(wtmJ*EHaj&3=9nafj|&S{{ymlfou&R<_2O#AQk~) zejv^VVvt&p8n(#?S%oKOaHve~Vc`(v1In;NW!0dx(B_pahZ$Kny!^2nWZim3PLN$7 zd$=cSa%8h|0a+ZIXL9&6ZGOQc!MKQrZIJ-eA`zxVLQIP!*g&KL+vFqbRVMqLk=g8^ Yae#5s1%u578Uak38}u3&7wPN(04fwmCIA2c delta 306 zcmZoT!Q60yc|#5p-v>YA=k7Jv7t173|Y4W<)%&!jP{=F5^Xd2$a Date: Thu, 27 Aug 2020 16:15:09 +0800 Subject: [PATCH 18/25] chsarp github action over --- .github/workflows/csharp.yml | 16 ---------------- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 58368 -> 58368 bytes package.json | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 98e96ed6..c90bb4f7 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -24,19 +24,3 @@ jobs: PROJECT_FILE_PATH: .\csharp\Wechaty.Grpc\Wechaty.Grpc.csproj VERSION_FILE_PATH: .\csharp\Wechaty.Grpc\common.props NUGET_KEY: ${{ secrets.NUGET_APIKEY }} - - - - -# - name: build and create nuget package -# run: .\build.ps1 -# working-directory: .\csharp\Wechaty.Grpc\buildTool -# shell: powershell - - - -# - name: push package -# run: .\publish.ps1 ${{ secrets.NUGET_APIKEY }} -# working-directory: .\csharp\Wechaty.Grpc\buildTool -# shell: powershell - diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index 3684b80292941969318e09aa8455a480b98b16b6..c2d732fa713fc0d86650032476514f0ee54e8a62 100644 GIT binary patch delta 1202 zcmb_bO-NKx6u$S)d-`S^{~DcnGvnC&m_MVXrnHE$#+-#FX@P{`DkOr!e&{Vi5^WJg z%p&Hr5Nb7xh!$z@xhb+{QbDAsg@{CpAZim4(FjSHodfUHU_TIa;d|dZ-?{g^@7{CY z#G-9t(RMAyx83V#7A0&I-uGNw;X4^)6Rj{RM)`uVCL(;qjY=hA6GzbG669|f*CRU- z#fa?)nj@K9gj|5AK%7B%5hI8y1g(uChY+;Jj~qah!a2#M7Mg0U$sUtoTKeKt&48A{ zjC{ZNP~E3rjTc1tI2or|WWF5XGGog)QK57FIdw-e-7QjT_rLq;xAU!rZWBy)-bpQvr~=G_q580*JilB>Jw$t{tEYv@^{O_lN*;eihOUOGwL?t zFEc#7NARm~>CHIYx#@)Yr53tuYyh&6Sp8Xcj199>_&mXmvt8^YJCAqiG#l%CroL(( zYr2q43(s}mM=a)tcw;*qS$eO~4<@)0$13y_TE;*NCI66UOX|@$=U1S!ZVZ$aXW7@G z$%ku|wuRLN*X^w0=)w9vX9E^HilC9INo;M)3+1<6NeGyqs`+si|8=YS?k;Y0_0CRy E2R255qW}N^ delta 910 zcmZuvO=uHQ5YD{rCc8}=tKHVW*lZi4(X4ib7HON4>Dqd14rO@cf zLImCMQZHfzuj;;DM1)Fv$U!6r@h0RZf(H*NG#BGM*{xg6gO8c{X5P*>^R`%ND^}Vb zWg+<{H^^evmHSJR3t!+^C=@CV;yjy&_k4pTA(tVhhtQ<6)3d+G?<7A>h!Xk<8es?F z4nfq4nlOHlyVbbI92Jq#;YE^XV`L+qf5@}D$fgMRTH5TmNzN_8Z9%NaZ#%zlzWZNl zI0=`8RMA?<6;g$?pj43)QhNzPs)&8LVXszj{%I{-_HMS5RXpDp-c4~!;e1840JZ23 zUQ@L{&f^)~jp^;E_oXGV13Ygf(PT0f`lcnJaEquDF&-oeiF3HlOkPjqK@DXowSQZ> zzvRYs#`WGBxY-FRIYnvlR$HGemap$!T}oir>7TA{ ogVJjGWt%w{by|NKuyVk_!fqOLlv)H|RbD3IId7z>=h>&f0lmN(MF0Q* diff --git a/package.json b/package.json index 827b85d1..6979f492 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatie/grpc", - "version": "0.17.3", + "version": "0.17.4", "description": "gRPC for Chatie", "main": "dist/src/index.js", "typings": "dist/src/index.d.js", From 8a37aad752828251b7ab34d6f0ceecbcf3f2adb6 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 27 Aug 2020 16:21:16 +0800 Subject: [PATCH 19/25] recovery github action --- .github/workflows.rar | Bin 4714 -> 0 bytes .github/workflows/go.yml | 62 +++++++++++ .github/workflows/maven-publish.yml | 30 ++++++ .github/workflows/maven.yml | 24 +++++ .github/workflows/node.js.yml | 49 +++++++++ .github/workflows/npm.yml | 98 ++++++++++++++++++ .github/workflows/php.yml | 40 +++++++ .github/workflows/pypi.yml | 93 +++++++++++++++++ csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 58368 -> 61440 bytes csharp/Wechaty.Grpc/Wechaty.Grpc.sln | 2 +- csharp/Wechaty.Grpc/buildTool/copy.ps1 | 2 - 11 files changed, 397 insertions(+), 3 deletions(-) delete mode 100644 .github/workflows.rar create mode 100644 .github/workflows/go.yml create mode 100644 .github/workflows/maven-publish.yml create mode 100644 .github/workflows/maven.yml create mode 100644 .github/workflows/node.js.yml create mode 100644 .github/workflows/npm.yml create mode 100644 .github/workflows/php.yml create mode 100644 .github/workflows/pypi.yml diff --git a/.github/workflows.rar b/.github/workflows.rar deleted file mode 100644 index efcb2276cf24796dba3fc57548de2920101503e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4714 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 bva!h5s_qJL%(_!|77Ty~p(X|(Trl8&STwg{ diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml new file mode 100644 index 00000000..2404b2b8 --- /dev/null +++ b/.github/workflows/go.yml @@ -0,0 +1,62 @@ +name: Go + +on: [push, pull_request] + +jobs: + + build: + name: Build + runs-on: ubuntu-latest + steps: + + - name: Set up Go 1.14 + uses: actions/setup-go@master + with: + stable: false + go-version: 1.14 + id: go + - name: Install Protoc + uses: arduino/setup-protoc@master + + - name: Check out code into the Go module directory + uses: actions/checkout@v2 + + - name: Get dependencies + run: | + cd go + make install + + - name: Build + run: | + cd go + make generate + go build -v generated/wechaty/puppet.pb.go + + publish: + if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v')) + name: Publish + needs: [build] + runs-on: ubuntu-latest + steps: + - name: Set up Go 1.14 + uses: actions/setup-go@master + with: + stable: false + go-version: 1.14 + id: go + - name: Install Protoc + uses: arduino/setup-protoc@master + - name: Check out code into the Go module directory + uses: actions/checkout@v2 + - name: Deploy + run: | + cd go + make install + # https://stackoverflow.com/a/4565746/1123955 + # https://stackoverflow.com/a/46253163/1123955 + ssh-agent bash -c "\ + echo '${SSH_PRIVATE_KEY}' | ssh-add - ;\ + make publish ;\ + " + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml new file mode 100644 index 00000000..02dccee8 --- /dev/null +++ b/.github/workflows/maven-publish.yml @@ -0,0 +1,30 @@ +# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path + +name: Maven Package + +on: + release: + types: [created] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + + - name: Build with Maven + run: mvn -B package --file java/pom.xml + + - name: Publish to GitHub Packages Apache Maven + run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml + env: + GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..db8eb4e7 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,24 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Maven + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Maven + run: mvn -B package --file java/pom.xml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 00000000..fb525670 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,49 @@ +# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: Node.js + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + strategy: + matrix: + os: [macos-latest, ubuntu-latest] + node-version: [10.x, 11.x, 12.x] + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Set up Go 1.14 + uses: actions/setup-go@master + with: + stable: false + go-version: 1.14 + id: go + + - name: Install Protoc + uses: arduino/setup-protoc@master + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Install Dependencies + run: | + npm install + npm run install:lint:protoc + + - name: Generate gRPC Stubs + run: npm run generate + + - name: Test + run: npm test + env: + CI: true diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml new file mode 100644 index 00000000..7d633923 --- /dev/null +++ b/.github/workflows/npm.yml @@ -0,0 +1,98 @@ +name: NPM + +on: [push, pull_request] + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 12 + uses: actions/setup-node@v1 + with: + node-version: 12 + - name: Set up Go 1.14 + uses: actions/setup-go@master + with: + stable: false + go-version: 1.14 + id: go + - name: Install Protoc + uses: arduino/setup-protoc@master + + - name: Install Dependencies + run: | + npm install + npm run install:lint:protoc + + - name: Generate gRPC Stubs + run: npm run generate + + - name: Test + run: npm test + + pack: + name: Pack + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + + - name: Install Protoc + uses: arduino/setup-protoc@master + + - name: Install Dependencies + run: npm install + + - name: Generate Version + run: ./scripts/generate-version.sh + + - name: Pack Testing + run: ./scripts/npm-pack-testing.sh + + publish: + if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v')) + name: Publish + needs: [build, pack] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + registry-url: https://registry.npmjs.org/ + - name: Install Protoc + uses: arduino/setup-protoc@master + + - name: Install Dependencies + run: npm install + - name: Generate Version + run: ./scripts/generate-version.sh + - name: Set Publish Config + run: ./scripts/package-publish-config-tag.sh + - run: npm run dist + + - name: Check Branch + id: check-branch + run: | + if [[ ${{ github.ref }} =~ ^refs/heads/(master|v[0-9]+\.[0-9]+.*)$ ]]; then + echo ::set-output name=match::true + fi # See: https://stackoverflow.com/a/58869470/1123955 + - name: Is A Publish Branch + if: steps.check-branch.outputs.match == 'true' + run: | + NAME=$(npx pkg-jq -r .name) + VERSION=$(npx pkg-jq -r .version) + if npx version-exists "$NAME" "$VERSION" + then echo "$NAME@$VERSION exists on NPM, skipped." + else npm publish + fi + env: + NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} + - name: Is Not A Publish Branch + if: steps.check-branch.outputs.match != 'true' + run: echo 'Not A Publish Branch' diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml new file mode 100644 index 00000000..aec31ec5 --- /dev/null +++ b/.github/workflows/php.yml @@ -0,0 +1,40 @@ +# For more information see: https://docs.github.com/en/actions/getting-started-with-github-actions +# For more setup-php see: https://github.com/shivammathur/setup-php +# For more setup-php protoc see: https://github.com/shivammathur/setup-php/issues/262 + +name: PHP + +on: [push, pull_request] + +jobs: + run: + name: Run + runs-on: ${{ matrix.operating-system }} + strategy: + fail-fast: false + matrix: + operating-system: [ubuntu-20.04] + php-versions: ['7.4'] + env: + extensions: xml, opcache, xdebug, pcov, grpc-1.30.0, protobuf-3.12.2 + key: cache-v3 + + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup PHP with extensions and custom config + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + extensions: ${{ env.extensions }} + ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Shanghai + tools: protoc, grpc_php_plugin + - name: Testing PHP version + run: | + php -v + php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}" + - name: Test grpc_php_plugin and protoc + run: | + protoc --version + cd php + make generate diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml new file mode 100644 index 00000000..c165b8aa --- /dev/null +++ b/.github/workflows/pypi.yml @@ -0,0 +1,93 @@ +name: PyPI + +on: [push, pull_request] + +jobs: + build: + name: Build + strategy: + matrix: + os: [ubuntu-latest] + python-version: [3.7] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + cd python + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install -r requirements-dev.txt + - name: Test + run: | + cd python + make generate + make test + + pack: + name: Pack + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: Install dependencies + run: | + cd python + python -m pip install --upgrade pip + pip install setuptools wheel twine + make install + - name: Pack Testing + run: | + cd python + make generate + make dist + echo "To be add: pack testing" + + deploy: + if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v')) + name: Deploy + needs: [build, pack] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: '3.7' + - name: Install dependencies + run: | + cd python + python -m pip install --upgrade pip + pip install setuptools wheel twine + + - name: Check Branch + id: check-branch + run: | + if [[ ${{ github.ref }} =~ ^refs/heads/(master|v[0-9]+\.[0-9]+.*)$ ]]; then + echo ::set-output name=match::true + fi # See: https://stackoverflow.com/a/58869470/1123955 + + - name: Is A Publish Branch + if: steps.check-branch.outputs.match == 'true' + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + run: | + cd python + make install + make generate + make dist + python setup.py sdist bdist_wheel + twine upload --skip-existing dist/* + + - name: Is Not A Publish Branch + if: steps.check-branch.outputs.match != 'true' + run: echo 'Not A Publish Branch' diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index c2d732fa713fc0d86650032476514f0ee54e8a62..6bbf7581ae787667cd683d14c9777b83b13af83c 100644 GIT binary patch delta 2197 zcmaJ?eN0qG5P$o4?|8s*f*uGbgp)6^A|40o0Z|`twg^-{YDp`o(27-y2zXFMEoaLg z)>t(+N!ut^J!6X2D%=vHHqmQ~ipHe0TGCW%Pn*=l+QhV&lqM~mx!xn!{?Sc-Z)Scw zJG(nOyU#fs;`D_avLp&xixLDfM8sc{laoX<_)K2bU+-WpvB@w}^Nm!tYm_a*4zCqD z#T8*J9rgJLs8UnFBFgM0JQd#-zY?G`q%)E{2MqYZHVc?Eb2i4EoQoDot>pySsW@TE znuS430_s_aXAn|=??6dmwFo5Vp*=Ieg$85<%2q@sVorcF;|w!4rJ+Te%tg5vVMF90 z@)1iB!I9Sn?4p1yMrlVZM?8yo4pD+wfha|kA)ZH2j2CgXB)Jx?^)&DNI@D-hYU@yM z2>8_mB=L=?Z$P~6AJK$bbD-B0kmS{d`Zh#6f+8lNbl`|N9^D60+(&5jB2FXDAU;Nr z7xaZ^NLSH-v2a`DHB_!6h7mU)GU5l1zF3AY#B6XxS4wf@=F2t0_qB0+JUUYcX2Z!a z{~=IfwIhddL#0CbqwH%WI}7d8DinrPNDwVopds;z_)y7ZAA%v#0^{}(h4y0(cB74= zTT*D0Yqc57u^AFor52n!V)rw*Rp&AmhcOx(6V%BTLc6hx<-$|rO4VzS8ya$_yenJB=|j{ER4ltukK$SRUmI*&={b_fT7M)UXB)3tc(~fyZ3D^ zKeKUPWk%6=+kV=gv|Rn;9n^<@*<9LqW^f;`$SCUXxO?J(X-O>kJbYos+>Uxrz7KgE zE`WZ`xToGJM^Guz>gh2pYfNMU?B3D~RT~z7+FYX(T7*}HYUp|`^`y6%xwq@Mck5$j zED$IYJMn4C##+n8uU&u>2a|cS^B#*hg-NBH%EBkmKlmm@_F5pmyN{jsTcvyApz2sW zkMDlSplY`XR<(Oz*Pd?Z>z>1=1~3CZ-cirs(czc>A$er)Zz233NGy_0Kx^qdy8k^{ zR?v>;X9rg?9(nv+2xK2lfxI`a^GAnc88{E@g$1I*?15?G!FR+A&Wi>(ek2ZlJ`yvf zH+)#Z^nCItGhje^MC{s{t$g#b66QV^&bvu5WJP0#j{4f4u$4q6-usNfVEc@PmWgvyH$l`%XCmi4ct8D z!zr4~P=C|}m#szM>oGw~PcB$25;=f*EY*FTxqT8;_o$#+yijjTh2F6QP_w=8d5A6I%v6d2+GgLL9qn<6Mg1Gb&%`$X delta 2057 zcmbVNeN0=|6@T|(3}h4tB!oa9PC`}|z&w9o>?9<9kLNG2jcxor62%680mgn{u%Toz zQx}mcQz@rwt8`j5XUabQ7{ssZ)-_#8Kx>m$Eo!PRTBg>GwzT`Gv`w3|XATwn_k`3*`;CSa3K2w^dtD-LJA6JB@n-I5U$NF!;4>Cf%@}#xcO)W`cKX;{f{}% zR>EUnn}#I)iL1olNK%g~8gV3CBXTQXOU0v9z-z7EMP6SlVQa&<3w} zQs=gy^Eis{jTuw!Jz@9d#1bXrEs&FR@;eS)#sI*nFtcy`Jx?;2N*OvQp8 zQ>$w-%Fr^_G#b@qG%;ObLZ3)QCdcfY!57SAXoFtIrDT>&+~(;u2hILrf9teb!*$v$ zdRxrtP|eC`hXWZ07537U*U1c>bI+tlgUWE)=pAvSLZKlOYqfW|;<}96M-SVEGQI#e zG-g$*#si(6(72^;JxL#{aSVt2GMmTkp^YA|%^qNbotkh* zT5XPT#!yt2oHmU11Z*mfQO|g%CKH+Xl-1wmjhjr$e$BLDN~c$gREfzcKKV_tXka?Gv+OM`$_hcef70(^)0|*Y7Nnr9unF zR|CPne<58AA3s^XLpXPWu`5{l75;aRR~A3fR?4GqY>Ht23x1GYI>fIoNO1pr_GNhe zNhx%YrJx-Yl@$Fu4$!RtfBN=ml>1f%iUE4yCJ7l%E;PdPI8o!})ejIH-(X?& z4LNS^JNWE+7UiyyuwrQ9v$vWMpSitGUgn-BA)sgZ?7LY6XMWKPg*$b?y`bV%KfhJ9 zq^z&ny!ZrZoH-?~sc`-6_{Z;bKtNH;Yn52tq_2fH->XLFLH1z+r21-@yZ=<~RRrec zIv6jsfL4FD>bKG7{`kn^DeB0AX3C#=V8h|N;hw$;cHPo~*08#L_muP0#zx6@0TMWU zrwTUiQm}IUDE~A0Ao{#2RuNEdm*cs`xDq)?jKlo*e&t0luiv`RKDPoMSAgKg8x&6! HHj4fQk7K Date: Thu, 27 Aug 2020 16:31:20 +0800 Subject: [PATCH 20/25] clear --- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 61440 -> 60928 bytes csharp/Wechaty.Grpc/buildTool/build.ps1 | 6 ------ csharp/Wechaty.Grpc/buildTool/common.ps1 | 3 --- csharp/Wechaty.Grpc/buildTool/copy.ps1 | 3 --- csharp/Wechaty.Grpc/buildTool/publish.ps1 | 9 --------- 5 files changed, 21 deletions(-) delete mode 100644 csharp/Wechaty.Grpc/buildTool/build.ps1 delete mode 100644 csharp/Wechaty.Grpc/buildTool/publish.ps1 diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo index 6bbf7581ae787667cd683d14c9777b83b13af83c..3446f3d5a46488bbad5f7ddcb578e9140de10e9c 100644 GIT binary patch delta 685 zcmZuuKS&#K6wdp3vAK9vlc=d7nzlhOwv<#sq}ViaHz?vix=5kU1tTcjo^yA)MhvBcr&!o_gKt1zS!x-+)`u8SY6Iv{V@BaJ?d(vNakn{z- z>>@QW*+FKEcQ6sl4mse4*Njp|R5EE2kT{Fx`KkX-94SO4_7KXP8E=s03*-0S@k=s( zkZvj6N`IhW&>?olJsl1;iS67WhnYox#MSP?5e3Z zPtf&?{m5am_ zyIbeldDjFrfwKIFn6l);1|Zh{p}1c5wAb~>-w9K7)a1gkSYPj06x19_EulJnhhf(~ o@(T`!dsTJ|XC~D^zPTsZ{iGjPFR5Ku{QXr?7rR%aX}))S3;Xu{`~Uy| delta 1296 zcmYk6%TE(g6vlfmQ)r=<0!0dfwosuIlmd##BcQP0Arz#+N5l|ahz27j#hAvVO?2S` z7W8afv+=ngtqbD{MH3Sf!@@^VV)z5tn3Mz-ir=Ak$lT=D@1Dn;nYnXLW9wP5jjW|< zsjZHG(`ZJHSw*$UWI6_Dw5f^$(wt07n-GUcXeFLqtXjla_0?>!z2s>wT9|au6^mo& zI0Am4sf2q_yV~m)*TF7Pz8s}_(7T`>)F_{u3)_yu`iDzTKq;kdTiG}QBb>RfGcKp? zOG7n(`X783{0^~3ipYrgNL%uul#(J@k!U;oJ{x|p^vAGb|5q7Y^Pq|qLkmEWvN`5c z`vXwE_hDcLTrwAA11I2erO?};T-i8|@x6ctjwJz}`CkOB$VLhm%q1KjgyuHHDP0f~Z8TdL6{l&d zaM&zb4N=ibvqe$!Nw^- z&XI9w_^5cqOLX rGU*O%2%7xirHz!EuBIHc`YS+7@7k#C_u0hSvZVK)yBAyDELO|^$)~}L diff --git a/csharp/Wechaty.Grpc/buildTool/build.ps1 b/csharp/Wechaty.Grpc/buildTool/build.ps1 deleted file mode 100644 index 5bb1f045..00000000 --- a/csharp/Wechaty.Grpc/buildTool/build.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -. ".\common.ps1" - - -$solutionFolder = Join-Path $rootFolder $solution - Set-Location $solutionFolder - & dotnet restore diff --git a/csharp/Wechaty.Grpc/buildTool/common.ps1 b/csharp/Wechaty.Grpc/buildTool/common.ps1 index 967df2b6..a20b650b 100644 --- a/csharp/Wechaty.Grpc/buildTool/common.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/common.ps1 @@ -12,9 +12,6 @@ $wechatyProtoFolder=Join-Path $rootFolder "proto" # chsarp solution Folder $solutionFolder = Join-Path $rootFolder "csharp/Wechaty.Grpc" -# nuget package Folder -$packageFolder=Join-Path $solutionFolder "nupkg" - # get package.json data $packageData=Get-Content (Join-Path $rootFolder "package.json") | ConvertFrom-Json diff --git a/csharp/Wechaty.Grpc/buildTool/copy.ps1 b/csharp/Wechaty.Grpc/buildTool/copy.ps1 index 65fca6e0..7fddafaf 100644 --- a/csharp/Wechaty.Grpc/buildTool/copy.ps1 +++ b/csharp/Wechaty.Grpc/buildTool/copy.ps1 @@ -33,9 +33,6 @@ $versionNode="" + $version + "" echo $versionNode $commonPropsData -Replace "(.*)" , $versionNode | set-Content $commonPropPath -$testdata = Get-Content $commonPropPath -echo $testdata - Set-Location $buildFolder diff --git a/csharp/Wechaty.Grpc/buildTool/publish.ps1 b/csharp/Wechaty.Grpc/buildTool/publish.ps1 deleted file mode 100644 index ff65e36d..00000000 --- a/csharp/Wechaty.Grpc/buildTool/publish.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -. ".\common.ps1" - -$apiKey = $args[0] - -$packageFile=Join-Path $packageFolder ("Wechaty.Grpc."+ $version + ".nupkg") - -dotnet nuget push $packageFile -s https://api.nuget.org/v3/index.json --api-key "$apiKey" - -Set-Location $buildFolder From 81c1ec5afcc907197edfe3e1b0e3738b34b00073 Mon Sep 17 00:00:00 2001 From: zhengbo Date: Mon, 31 Aug 2020 22:18:07 +0800 Subject: [PATCH 21/25] update gitgnore --- .gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 515df4c4..7bfded7b 100644 --- a/.gitignore +++ b/.gitignore @@ -80,9 +80,16 @@ target/ python/src/ # csharp +*.nupkg +.vs/ +*.suo +*.user +*.userosscache +*.sln.docstates + csharp/Wechaty.Grpc/.vs/ csharp/Wechaty.Grpc/proto csharp/Wechaty.Grpc/obj/ csharp/Wechaty.Grpc/bin/ csharp/Wechaty.Grpc/nupkg/package/ -*.nupkg + From 1e74e638d948f0388300e39e74f7df9391810dfa Mon Sep 17 00:00:00 2001 From: zhengbo Date: Mon, 31 Aug 2020 22:20:54 +0800 Subject: [PATCH 22/25] delete .vs folder --- csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo | Bin 60928 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo diff --git a/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo b/csharp/Wechaty.Grpc/.vs/Wechaty.Grpc/v16/.suo deleted file mode 100644 index 3446f3d5a46488bbad5f7ddcb578e9140de10e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60928 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%0A0i6X&K8qD08xD|Rr#kNIHy+5 zAk)h~)tXD&d`#<{BgrS*JR>dImGh8V8B@!%>Lt0Q_9}53)xKOQ2s}Y@bNI1ZYhVe@ z?8n8q50uSNuY3)W4?B4trZn=AP0mTFt!nYBTpOF*P_9&|F$w8Mr8@HY^_x@g+Fnqt z-l=N-;D$=5cZ@We)#a11@7t8TXluoz%mwoDJx>^o;&f51{4$C=F7p>PBZptIx^dI< zN}59Hw#2`ZC)u3#)7Dva+D1NUegk#VoQZ|3F#LpqZwAzzMi>Q9_j&jVXh#eD@)y53 zTl1`AJ+=d-QBv#c$ubX9&e`jun{EDIPYX1n6s_xjOWG*CRIAh*O0z}v-rt_tYtQWM zIW!DfRKAwc3ZL0%WVGi{?OKugHNqg~0-kWcfLWYYaP2u%HB)S54h;&!sKE$kQ|eTw zG1sP1xAggOYJcf|32}!s7q`8@#>c$g^udl2Hl>E=X|%XWV9(trKC$Xzer^zwzf{&)3)+_)+E z*HWtz|Dp2y#;0S8&uyFY4TSc*@VxW;Z>^qFhRTjMo*YGVH*9+TE2-_J&pu^8_n&_B zhJBA;`0X3s{NuySRpr`!S|H`lN;G>EbcS?++Cr`!mQ#lv2zzf65{H&UsWubP6yc60 z(vz(cTA9g9?ONh1OJN3yx~4R8-sQ;I#^t=TUH{v9dsXuM?4Mjil25^cp3&J(^QSii*WIU72i;P_U>IU~% zYZGjFiEsqjpDBp>LU3LzWGq2fF6RvuL&4!}B$NtHi|Jf&+CL>-mm+rR z*(Y+&?>>0NhyHW-Q~BrED3z=eIHi&VT+Z#1Mpb^?zOsI38&Qw())lX{pvq{jpMR5QJT5#r9mvFR3**mul(%>7GANH~lZJ*0$0qV+|q&oUK8A zWPRFec_v;bKJc8l@7s63@4D9QXS8Xx{ms`vwfXIDg1cw`@r3{JXKc^E|9`}u_!Uz< zX Date: Mon, 31 Aug 2020 22:33:13 +0800 Subject: [PATCH 23/25] update README.md for csharp --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 6c68de79..43ea43e4 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,15 @@ Maintainer: - [@zhangchunsheng](https://github.com/zhangchunsheng) - Chunsheng ZHANG (张春生) +### Csharp + +[Wechaty.Grpc @ Nuget](https://www.nuget.org/packages/Wechaty.Grpc) + +Maintainer: + +- [@Darren](https://github.com/jesn) - Darren (郑波) + + ## DEVELOPMENT ### Debug From aaaf86b354d785b8c952e7c209ee4f1464e58120 Mon Sep 17 00:00:00 2001 From: zhengbo Date: Mon, 31 Aug 2020 22:40:13 +0800 Subject: [PATCH 24/25] README.md update csharp grpc doc --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 43ea43e4..fc819cc5 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,11 @@ TCP hole punching - [gRPC typing stubs for Python](https://github.com/shabbyrobe/grpc-stubs) +#### csharp grpc +- [Create a gRPC client and server in ASP.NET Core (microsoft)](https://docs.microsoft.com/en-us/aspnet/core/tutorials/grpc/grpc-start?view=aspnetcore-3.1&tabs=visual-studio) +- [ASP.NET Core 3.0 使用gRPC (晓晨Master) ](https://www.cnblogs.com/stulzq/p/11581967.html) + + ## HISTORY ### v0.17 (Aug 5, 2020) From 9d14041686692078d188c75371fe64844d60fcc6 Mon Sep 17 00:00:00 2001 From: zhengbo Date: Mon, 31 Aug 2020 22:47:44 +0800 Subject: [PATCH 25/25] README.md add nuget introduction --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fc819cc5..1c31cc58 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,7 @@ TCP hole punching - [gRPC typing stubs for Python](https://github.com/shabbyrobe/grpc-stubs) #### csharp grpc +- [An introduction to NuGet (microsoft)](https://docs.microsoft.com/en-us/nuget/what-is-nuget) - [Create a gRPC client and server in ASP.NET Core (microsoft)](https://docs.microsoft.com/en-us/aspnet/core/tutorials/grpc/grpc-start?view=aspnetcore-3.1&tabs=visual-studio) - [ASP.NET Core 3.0 使用gRPC (晓晨Master) ](https://www.cnblogs.com/stulzq/p/11581967.html)