Merge pull request #460 from openziti/release-next

Release 1.10.6

DesktopEdge/Properties/AssemblyInfo.cs

@@ -50,6 +50,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.10.5.0")]
-[assembly: AssemblyVersion("1.10.5.0")]
-[assembly: AssemblyFileVersion("1.10.5.0")]
+// [assembly: AssemblyVersion("1.10.6.0")]
+[assembly: AssemblyVersion("1.10.6.0")]
+[assembly: AssemblyFileVersion("1.10.6.0")]

DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs

@@ -246,7 +246,7 @@ private void TimerTicked(object sender, EventArgs e) {
 		private void ShowMFAToast(string message, ZitiIdentity identity) {
 			logger.Info("Shwoing Notification from identity " + _identity.Name + " " + message + ".");
 			new ToastContentBuilder()
-				.AddText(_identity.Name+" Service Access Timed Out")
+				.AddText(_identity.Name+" Service Access Warning")
 				.AddText(message)
 				.AddArgument("fingerprint", identity.Fingerprint)
 				.SetBackgroundActivation()

Installer/ZitiDesktopEdge.aip

@@ -23,10 +23,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
     <ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
-    <ROW Property="ProductCode" Value="1033:{15F4DF1B-9E64-4383-BD41-AB0C9BA475E4} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{5452420C-0907-48D1-9080-7570A0AC0CEA} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Ziti Desktop Edge"/>
-    <ROW Property="ProductVersion" Value="1.10.5" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.10.6" Type="32"/>
     <ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>

ZitiUpdateService/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.10.5.0")]
-[assembly: AssemblyVersion("1.10.5.0")]
-[assembly: AssemblyFileVersion("1.10.5.0")]
+// [assembly: AssemblyVersion("1.10.6.0")]
+[assembly: AssemblyVersion("1.10.6.0")]
+[assembly: AssemblyFileVersion("1.10.6.0")]
 

release-notes.md

@@ -1,3 +1,18 @@
+# Release 1.10.6
+
+## What's New
+* none
+
+## Other changes:
+* Notification Title correction
+
+## Bugs fixed:
+* [#458](https://github.com/openziti/desktop-edge-win/issues/458) When user start tunnel and then immediately stop it, WDE crashes because of null value in the context
+* [#461](https://github.com/openziti/desktop-edge-win/issues/461) ZDEW crashes when controller/router certificate expires
+
+## Dependency Updates
+* update t-sdk v0.15.18 and c-sdk 0.26.9
+
 # Release 1.10.5
 
 ## What's New

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.17
+SET ZITI_TUNNEL_REPO_BRANCH=v0.15.18
 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

service/ziti-tunnel/service/ipc.go

@@ -160,7 +160,7 @@ func SubMain(ops chan string, changes chan<- svc.Status, winEvents <-chan Window
 
 	log.Debug("shutting down. start a ZitiDump")
 	for _, id := range rts.ids {
-		if id.CId != nil {
+		if id.CId != nil && id.CId.Loaded {
 			cziti.ZitiDumpOnShutdown(id.CId)
 		}
 	}

version

@@ -1 +1 @@
-1.10.5
+1.10.6