From 11e1c607eb7c3f957083db6426105f9bc4e5aa09 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 8 Jan 2021 11:03:48 -0500 Subject: [PATCH 1/5] update version to 1.6.25 to address file share issue --- service/build.bat | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/build.bat b/service/build.bat index ee9b5386..481983d7 100644 --- a/service/build.bat +++ b/service/build.bat @@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and REM limitations under the License. REM SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git -SET ZITI_TUNNEL_REPO_BRANCH=v0.7.26 +SET ZITI_TUNNEL_REPO_BRANCH=v0.7.26.1 REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk SET ZITI_SDK_C_BRANCH= REM the number of TCP connections the tunneler sdk can have at any one time diff --git a/version b/version index 4ad1e55e..a92834b0 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.6.24 +1.6.25 From 520a9788f4336781f02139233848b46c6752e755 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 8 Jan 2021 11:08:09 -0500 Subject: [PATCH 2/5] update release notes too --- release-notes.md | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/release-notes.md b/release-notes.md index db209dd4..1cd9db60 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,62 @@ +# Release 1.6.25 + +## What's New +* none + +## Other changes: +* none + +## Bugs fixed: +* [#287](https://github.com/openziti/desktop-edge-win/issues/287) - access fileshare via UNC path in Windows explorer very slow + +## Dependency Updates +* updated TSDK/CSDK to v0.7.26.1 + +# Release 1.6.24 + +## What's New +* fixes to c sdk to better handle when the controller is unavailable at startup + +## Other changes: +* none + +## Bugs fixed: +* none + +## Dependency Updates +* updated TSDK/CSDK to v0.7.26/0.18.7 + +# Release 1.6.23 + +## What's New +* fixes to c sdk to better handle when the controller is unavailable at startup + +## Other changes: +* none + +## Bugs fixed: +* none + +## Dependency Updates +* updated TSDK/CSDK to v0.7.26/0.18.7 + +# Release 1.6.22 + +## What's New +* fixes [#274](https://github.com/openziti/desktop-edge-win/issues/274) - Added logging to all SC calls into the monitor service +* feedback now collects systeminfo and dnscache info +* added a "please wait" to the feedback option + +## Other changes: +* none + +## Bugs fixed: +* stability fixes when the monitor service is down the UI should not crash when trying to access the monitor service +* stability fixes from tsdk/csdk + +## Dependency Updates +* updated TSDK/CSDK to v0.7.25/0.18.6 + # Release 1.6.20 ## What's New From aad946f27b841db6b6bc647fec4417831e12a6c3 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 8 Jan 2021 16:18:57 +0000 Subject: [PATCH 3/5] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- service/ziti-tunnel/version.go | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 0cacaaa1..c734582a 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.24.0")] -[assembly: AssemblyVersion("1.6.24.0")] -[assembly: AssemblyFileVersion("1.6.24.0")] +// [assembly: AssemblyVersion("1.6.25.0")] +[assembly: AssemblyVersion("1.6.25.0")] +[assembly: AssemblyFileVersion("1.6.25.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index c94ed1a1..8395b28b 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -22,10 +22,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index 8c8c88ea..9ad18429 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.24.0")] -[assembly: AssemblyVersion("1.6.24.0")] -[assembly: AssemblyFileVersion("1.6.24.0")] +// [assembly: AssemblyVersion("1.6.25.0")] +[assembly: AssemblyVersion("1.6.25.0")] +[assembly: AssemblyFileVersion("1.6.25.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 9dd0a32f..9829fee5 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.6.24" - Revision = "8fff18ede7dc" - Branch = "master" + Version = "1.6.25" + Revision = "520a9788f433" + Branch = "release-1.6.25" BuildUser = "" - BuildDate = "2020-12-23 13:32:35" + BuildDate = "2021-01-08 16:12:45" ) From 8f698841cb999081e5100718ba0ce12c1eb7e1bc Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 8 Jan 2021 11:45:45 -0500 Subject: [PATCH 4/5] update to nlog 4.7.6 --- DesktopEdge/Assets/Images/update.png | Bin 0 -> 4992 bytes DesktopEdge/ZitiDesktopEdge.csproj | 5 ++++- DesktopEdge/packages.config | 2 +- .../ZitiDesktopEdge.Client.csproj | 2 +- ZitiDesktopEdge.Client/packages.config | 2 +- ZitiUpdateService/ZitiUpdateService.csproj | 2 +- ZitiUpdateService/packages.config | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 DesktopEdge/Assets/Images/update.png diff --git a/DesktopEdge/Assets/Images/update.png b/DesktopEdge/Assets/Images/update.png new file mode 100644 index 0000000000000000000000000000000000000000..4a846972edc33d404f5c48935c8ddedf2aac5b4d GIT binary patch literal 4992 zcmZ`-_ct4i*Qd2h2{mf3peTYECGx}$YP7VmYX-F`BF0m-x0KpEh*`C2&(^Ljv}UO- zw%Gga_YZi_{oHZR=iYOFy64_=qx5w(XsB4Jh=_=2;F_v0{(9{Hl!EN9eOwm?BO+qZ zfUCj`{jzqmDU-A9PMIx{lyBl zJ6__@z&2f+DqIa7!T(Ns_PtOrFCL9~IEm-@8TRVYDm6Tq2Y)YAo}MdF+8p-|lN0Z^ zTa8%|#QXAROLX3KL@)R^VZHdx`5m*de zk)tQjm&;!F-%lx}9h&X`Wbe~@#%a3stYS{T7Q^jZEySV)GJ5jHb%w*wWr{9Gb=v0s zD412yOHmZh1^mt9h~zs-`yw5|o?Oe>rcTxkW>-)46Y4X#!`#k!TEzn?)+B;f zv(J<6QgWn+4=iZfL}h#q(8TwzLl0iQ#zy|wwiTtB<3;5NGjR96N;vgs-q$R#p92xMmxu{*9^B}Na7VSGsisKvw{gB&MObnqiGJ@^JUqrJ#fyk zT`}Hbw|i5-*gwXR6EnhhvGVV(&t_CZME|^#<7k=nW_n~!UA%}n&ILyrm6MOKOT%$G zttzgC*J92w)gEzI2L1!$8c_7dZk6Vxt%A_7;o>PFFHx@w2KPI2%SF>+lBt87wdq)o zx%8}8n$L3O--z~3@LB$tzsN+PC{f0fjTTG3z(5_`4i$|Zb-sDO)=3nCd6Y*bG}Wa~ zVn4^1i?25c;C3dYp6|&QDHS05UHFQFglec{*{yg&dqHK}71806Le2Y$aHRX+cU_9x zTZ{ai2a8=>(D`*%?tVp=6|=9hWUlw*-3 z)xGDOBu&yuwnk4~&z0&1IO}HIRnBDjZIm=IFdRksNmFpW)%3IVq4H&Y^l@_F=J2{2+h>A%8o~_mh_j zC2{3!&xkUK9!+-tUS}BXK&mxu-*BK51lHFX;k=9x{m-?3epoJ6@iYPQ5D#DX_z z0mXJ|AK(_(P3B*3loqR8PU|A-DQ4GhAw{4M^2x=vlwF%ndAiv>{JA5LTg(22qT?BE z(}Tz2Yeo_?tohfCEQw4jz3)mXJTrcbDwze`E`S%F|H6|M8P{mP+9RQq7ReZp6YMLI zix&+0Q{1}AM(G0oz6_WFWb*pEIitV$i{ zy!CX?jSGpvn8cM-Jfxu5>n^+!s?JY0ks+k5{v50d@O`*f`1qVzJwuPguYMhH?g=Jt zPak)Z2Y=BNml-f3ZkzM72I~zpGf2T?pg`(PG2n`f-U^D?AV}!#R6b=5*gb!qA77dF z;IbwpIc7)#R?p;WKo})n=PpidsPP;nVX)mkB!%Dg&f_A!g3^$ZsnW1|PS^9>XsjDr z=|Xk+wPkisrWCARU}V>y;b@??(41=Z?Ao5mZG>bdgS|-cI8_lW5w=Nass`JJIGYd5 zgtz}3&m!NLvVQ%$-z1S#phMs~pymTrtI}L9JIrr3D^2fHp?K9$cGdPncKrmLB){FE!5Kh#$x8)D>^B#j213v@y7N_<~b~YIhQ` z=;#a^DPZl?^6y>R@SO>Z@i>RlUCf4a0e3LPH7A;^T05eLUl1X&^0uQ^mZ>78>tM|E z#>x)k6(mD={1Al}83SlM@L zh#(Z=seqd`rKgzjho1r@jDUk>%_-SVkCUn3Kd4WI)$N0b5O3L|%jDe0dV>U-O4(&x z0{KQ>_PAmRM2-?ZmH;h(((WJMuCCD`v+Zj>dE%x{{x`$sLUyg%0Gk?S^Sb|Gdx{ zlvBoqD5N4n=J82y4XmYjw2{NKEz@K(#i!@vpt74@`c)g9=!s(=@kA5HHGP7LxIEzs zvgcq=eWWJ}Q_>zR^I?k%s$Xze7jBFjuplfP*c5VTC#s}TE18EC+;Ts558jxe zk8}1=BMyqqRiJsf$@5_+2?PO?mu%j_JN#Nes)W+(UXLak@%^_LUN?cU$v}ZDP3y$Z?2tkg-*(^RRr~5Yc2cKE zT2-MU$H{Qmt2wlybIc0D1^w}zyGp4*CWN&bpO>nTT%)uqH{ZX2;BNrY1B(!j8%evI zC(D-Ml(>>^G1_7^Q-}Dt|HZDf6M7(TBsBxpAnL{$iV4p@NmPI3jrMyRou@{4o~RDA zIHsr(O5=_z-#nszLM;i*;EvN`KP_)$!#-iaCW+|$O__x>#8D0qNx)cBShn*LUToI$ z2xu12GXU&ZwQ}&Z&^{7JL+fab_f>h1GE3qk|JU~st?Zj8(nDkaW5OfY+$H`?yS=js zkroC;SV+=*;N*EL-u0JTcF=>7k=h~|K?~oTu2ck@)XiB`Xw!d*2S!SpxLH$q@*c%s zuzwV?Zc6D-Vg?|geLREDhJb1~x_ClkQ+pzbxY{Eu!=jq=h#Z#(6TSKQ*HuSnfs1XP zQ%%&YB%N0u3;k{2*0J{lF^WMYQLK7H7{33d%Iyb<$sBi`<-$;$??i@7)zyuAC zMrr7pJ-Q$lc>HOOWlNU-;aoXBC4IPLm9L)zR5k{Utve790Ulu`> zV(?5oyUyobEclD^?qk`zi*{@#@Mg@*cT&AC>d<)yQ9>jVjue9#nHFtHcM$g9+BIh-p=Dzj<0W$wf@#0>Pzx-jsBT zXq12$dQ|eX1M&+k35$e<<5~{cyW_V4-(;$wOvQ5wLQaM9GJ?nl^abi^_nq(rh%eXZhwb zHAFUvNH-(pPUvj8tXoxZ5V=Dn2$?yoZ4&v|I!c2jkeW>SV+tz~67I*)(s(I-+2(wo z;hkW;KSj+y`g<`^`oO6HPCE+xKcN$VEnc5E^KZS1G1e|jN>t|adQvO-pDT{pDIeCP z88e%(ypcPhU)7xA;4f=MhQbLt`O(kt5N3LUOpGm7J}K8u%5)7Z;>zD_h&#*~Z3uIG zeJuC0)z4{`0dB?D#5bt4Ve2gB~lUaL*)u z*|76`tf^$sg1>?7!ntV<+^iEBh<@ckjRIgzU4p}x)iV(X^B7N3UkN~!sTlCJZsw*f zup@TC`$rYz!i?ndW=9{*1$P`)M~QbPkYv=l+T5m5q5!Lib?`@&V`ZMk)pl}eO@v0j z^?X7pK2O!XC&>&+HWBLSFk2+>aEF8U48QvCvp-_m$4R0MltVGxv{q9YLjj{vYk|j! zmeJmE%=F(|>}E~*X{NyE5BSZQ94y_9o`r#~dI2 z8wVnvQMnTE%#h^UZ{GnrQ{7#%7HLT{R3HOduzDch)4c8y0wqpa61X2CT1D3sgvcm2 z;1C<#q?L%ec;N#G>R>wBR*yXO@cGJEOJMMFhsK4lnJaNSqW)~we0rEC5Ywg(w{rj7 zdBhT;B!b^#pMPobq~o(T9Ik09s2FvG_#H`_FCcBAJ8TMkURb9zc8{3OF&%aoo?sv$ z9LgCY*ls>Z?$AwSj?^&Crb9wHCkT;8hHaTkV8d8fqrhTpk$K!0KGS#IJJ~6AbAQf!spukR?ubNyc^RT|q8}{Bs28r8+fe=BbKMwJm zZwwnlpA2e-(FRPbxc}fd37Bl9sG-XX8x_E;@rOtTDa#puE$K~w6_E7bsQ%-&wAuA^CUso6?cYk2Xq3Z*L%6NMl@AUJPBd(#HZ zCkaCRUHpJRLmWBi+8%Z>=vGi{qTBzgiNZrx~GYv3yBh_49=P z)QSDS!{iCrpmDqn=$D@6q*CsSVvIyS&+nlu&_qBQ%j)l!D<(&RQG*JZj2p+S799vA zC~Qo-zz5&G7+I~N{M3PDDvwRFa-}dRa>29yXMK4;(f$s4wOQ7X=T4nq2UT02_s=(A zN*B_weY&2dz&h^2D%|gr07rqi`wEyVJITu0EtJadsfirjv+|S0smNeyp@xaSIYsJK z%Jl>BdCZ%gN6R5JBR{5tQjx#j^j`32h?)J{{&&ej#G0f>ZrhU9!E4qpp>GI54=v*D z9h6@~)pw4k>{RGAh&Mz8xvW zKG~?ZpSzGTOr!-Y)Fom#3Wf!>BM%q8y?vDrH4wNIrQSmF4q0Q<22EaSv73`{Ee=GE zC972{lgevKj#;$|7o2Eb9pu^r`y~U-Y&aO%bn_k!mI7)Hord`+eb+xU%C=;pw%1tf zbCHPOkoR#1wN_{cH=D!5ckAf7$Z~vv27b9cp1;c4!+Im45InoBKm*yiYRg#xnWdpK zxceK0JHx9)g7WezzGZq+EB(G{{Zp6bMEGV#g7@?c!vZE~gC z={AcYXeam^Q@bzT=i-^Z;1t^Xe6 z-%?DUIq0^E%xOSZ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.6\lib\net45\NLog.dll @@ -378,5 +378,8 @@ ZitiDesktopEdge.Client + + + \ No newline at end of file diff --git a/DesktopEdge/packages.config b/DesktopEdge/packages.config index 9001a312..4539b443 100644 --- a/DesktopEdge/packages.config +++ b/DesktopEdge/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj b/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj index 379bf357..b093c37d 100644 --- a/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj +++ b/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj @@ -36,7 +36,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.6\lib\net45\NLog.dll diff --git a/ZitiDesktopEdge.Client/packages.config b/ZitiDesktopEdge.Client/packages.config index 17631c80..8a7eb305 100644 --- a/ZitiDesktopEdge.Client/packages.config +++ b/ZitiDesktopEdge.Client/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/ZitiUpdateService/ZitiUpdateService.csproj b/ZitiUpdateService/ZitiUpdateService.csproj index a80cadf4..dde15518 100644 --- a/ZitiUpdateService/ZitiUpdateService.csproj +++ b/ZitiUpdateService/ZitiUpdateService.csproj @@ -80,7 +80,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.6\lib\net45\NLog.dll diff --git a/ZitiUpdateService/packages.config b/ZitiUpdateService/packages.config index bba3d6da..04f986fe 100644 --- a/ZitiUpdateService/packages.config +++ b/ZitiUpdateService/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file From 190623c9f463514b278376aebd3929621abf6884 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 8 Jan 2021 11:50:08 -0500 Subject: [PATCH 5/5] merge the UI work to add filtering of services into the UI --- DesktopEdge/IdentityDetails.xaml | 19 +++++++++++++- DesktopEdge/IdentityDetails.xaml.cs | 40 ++++++++++++++++++++++++----- DesktopEdge/MainMenu.xaml | 24 +++++++++++++---- DesktopEdge/MainMenu.xaml.cs | 17 +++++------- release-notes.md | 3 ++- 5 files changed, 78 insertions(+), 25 deletions(-) diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml index d2472688..a94fea10 100644 --- a/DesktopEdge/IdentityDetails.xaml +++ b/DesktopEdge/IdentityDetails.xaml @@ -51,7 +51,24 @@ -