From 6ea448897633e426cfc50c1d4950794ff47f4405 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 7 May 2021 15:31:39 +0000 Subject: [PATCH 1/2] [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 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index cdc8c37a..69c6b337 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.5.0")] -[assembly: AssemblyVersion("1.9.5.0")] -[assembly: AssemblyFileVersion("1.9.5.0")] +// [assembly: AssemblyVersion("1.9.6.0")] +[assembly: AssemblyVersion("1.9.6.0")] +[assembly: AssemblyFileVersion("1.9.6.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index fdf12b5b..619e25ae 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -23,10 +23,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index caf07ee6..03a5efb4 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.5.0")] -[assembly: AssemblyVersion("1.9.5.0")] -[assembly: AssemblyFileVersion("1.9.5.0")] +// [assembly: AssemblyVersion("1.9.6.0")] +[assembly: AssemblyVersion("1.9.6.0")] +[assembly: AssemblyFileVersion("1.9.6.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 9c45ed81..1a18d05f 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.6" - Revision = "6df2e566867e" - Branch = "main" + Revision = "a814d8a0ec98" + Branch = "release-next" BuildUser = "" - BuildDate = "2021-05-06 18:13:12" + BuildDate = "2021-05-07 15:25:55" ) From 28d1c1dffdf0eaaf40c6bb0e4e4db106a5803de2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 7 May 2021 15:42:24 +0000 Subject: [PATCH 2/2] [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 1a18d05f..e46b61dc 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.6" - Revision = "a814d8a0ec98" - Branch = "release-next" + Revision = "0b4ea0cad709" + Branch = "main" BuildUser = "" - BuildDate = "2021-05-07 15:25:55" + BuildDate = "2021-05-07 15:36:08" )