From 59dc40ec49b17b4078641e2d7137d2bb3295fa14 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 13 Jul 2021 11:06:46 -0400 Subject: [PATCH 1/9] update release notes as well --- release-notes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 394e875a..2d87ea5a 100644 --- a/release-notes.md +++ b/release-notes.md @@ -7,7 +7,8 @@ * none ## Bugs fixed: -* none +* [#408](https://github.com/openziti/desktop-edge-win/issues/408) Toggling an identity ON (true) responds with Active:false +* [#403](https://github.com/openziti/desktop-edge-win/issues/403) 0 DNS questions in a Response causes crash ## Dependency Updates * wintun updated to 0.12 From 5b56590ae46073d26015a3be7d876c40a3969ef7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Jul 2021 15:12:28 +0000 Subject: [PATCH 2/9] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 7e46dd86..1af9d9b9 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.10" - Revision = "307fe37ade59" - Branch = "release-next" + Revision = "650ab72700e6" + Branch = "main" BuildUser = "" - BuildDate = "2021-07-09 17:03:23" + BuildDate = "2021-07-13 15:07:12" ) From 2f071fe9ebf802d359478cb6d01ec3088b1a17d3 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 14 Jul 2021 17:29:19 +0000 Subject: [PATCH 3/9] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 1af9d9b9..f3df1f92 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.9.10" - Revision = "650ab72700e6" + Version = "1.9.11" + Revision = "6ed518f54d6f" Branch = "main" BuildUser = "" - BuildDate = "2021-07-13 15:07:12" + BuildDate = "2021-07-14 17:23:48" ) From 2c36e544576bdef32aeea195ec00d27ed9d4af35 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 16 Aug 2021 17:51:05 +0530 Subject: [PATCH 4/9] t-sdk 13, c-sdk 0.24.3 --- service/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/build.bat b/service/build.bat index c869a6ae..b2aa6cfb 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.15.8 +SET ZITI_TUNNEL_REPO_BRANCH=v0.15.13 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 From f56b73d7e28cc9d8bd11d3adca1286dd986765c5 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 16 Aug 2021 17:54:47 +0530 Subject: [PATCH 5/9] updating t-sdk 0.15.13, c-sdk 0.24.3 --- release-notes.md | 14 ++++++++++++++ version | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 2d87ea5a..66421c1a 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,17 @@ +# Release 1.9.11 + +## What's New +* none + +## Other changes: +* none + +## Bugs fixed: +* none + +## Dependency Updates +* tsdk is updated to v0.15.3, c-sdk 0.24.3 + # Release 1.9.10 ## What's New diff --git a/version b/version index f0a2883d..5e9287b8 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.9.10 +1.9.11 From 327e793774ef066a73082383caf451c3dcb46f7e Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 16 Aug 2021 18:06:57 +0530 Subject: [PATCH 6/9] updating Advanced Installer version --- Installer/build.ps1 | 2 +- Installer/reg.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 2083a5dc..4c299ae3 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -24,7 +24,7 @@ msbuild ZitiDesktopEdge.sln /property:Configuration=Release Pop-Location -$ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer 18.4" +$ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer 18.5" $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com" $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" $installerVersion=(Get-Content -Path ${scriptPath}\..\version) diff --git a/Installer/reg.bat b/Installer/reg.bat index 044ca561..d50078a9 100644 --- a/Installer/reg.bat +++ b/Installer/reg.bat @@ -1 +1 @@ -"C:\Program Files (x86)\Caphyon\Advanced Installer 18.4\bin\x86\AdvancedInstaller.com" /register %1 +"C:\Program Files (x86)\Caphyon\Advanced Installer 18.5\bin\x86\AdvancedInstaller.com" /register %1 From d57dbedd99e071f113b8c77c5cfd5dbadf769ac8 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 16 Aug 2021 12:52:40 +0000 Subject: [PATCH 7/9] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 6 +++--- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- service/ziti-tunnel/version.go | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 745f32e5..61c6e293 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.9.10.0")] -[assembly: AssemblyVersion("1.9.10.0")] -[assembly: AssemblyFileVersion("1.9.10.0")] +// [assembly: AssemblyVersion("1.9.11.0")] +[assembly: AssemblyVersion("1.9.11.0")] +[assembly: AssemblyFileVersion("1.9.11.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index a8a6864e..1c467fff 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -1,5 +1,5 @@ - + @@ -23,10 +23,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index 26778098..ac2d8a13 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.9.10.0")] -[assembly: AssemblyVersion("1.9.10.0")] -[assembly: AssemblyFileVersion("1.9.10.0")] +// [assembly: AssemblyVersion("1.9.11.0")] +[assembly: AssemblyVersion("1.9.11.0")] +[assembly: AssemblyFileVersion("1.9.11.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index f3df1f92..f5f555df 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.11" - Revision = "6ed518f54d6f" + Revision = "327e793774ef" Branch = "main" BuildUser = "" - BuildDate = "2021-07-14 17:23:48" + BuildDate = "2021-08-16 12:45:02" ) From e0017c5c791e32e9003ef4425021bf0977e21f4f Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 16 Aug 2021 21:36:44 +0530 Subject: [PATCH 8/9] correcting the t-sdk version in the release-notes --- release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 66421c1a..2c945b4c 100644 --- a/release-notes.md +++ b/release-notes.md @@ -10,7 +10,7 @@ * none ## Dependency Updates -* tsdk is updated to v0.15.3, c-sdk 0.24.3 +* tsdk is updated to v0.15.13, c-sdk 0.24.3 # Release 1.9.10 From 3ab2d4edf32b1d7a7af53af8922ec12b27662d3c Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 16 Aug 2021 16:16:40 +0000 Subject: [PATCH 9/9] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index f5f555df..700405f4 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.9.11" - Revision = "327e793774ef" + Version = "1.9.12" + Revision = "b5867440bb05" Branch = "main" BuildUser = "" - BuildDate = "2021-08-16 12:45:02" + BuildDate = "2021-08-16 16:10:52" )