From c405af630b1bd4d4653ff8a089389f8591c42ef6 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Fri, 27 Nov 2020 11:04:34 -0500
Subject: [PATCH] update log format - needs colons. also add formatter to
 console logger and update release notes/version

---
 DesktopEdge/ZitiDesktopEdge.log.config    |  5 ++--
 ZitiUpdateService/ziti-monitor-log.config |  5 ++--
 release-notes.md                          | 30 +++++++++++++++++++++++
 version                                   |  2 +-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/DesktopEdge/ZitiDesktopEdge.log.config b/DesktopEdge/ZitiDesktopEdge.log.config
index 8b7d14da..64988757 100644
--- a/DesktopEdge/ZitiDesktopEdge.log.config
+++ b/DesktopEdge/ZitiDesktopEdge.log.config
@@ -3,9 +3,10 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <targets>
-        <target name="logconsole" xsi:type="Console" />
+        <target name="logconsole" xsi:type="Console"
+          layout="[${date:format=yyyy-MM-ddTHH\:mm\:ss.fff}Z] ${level:uppercase=true:padding=5}&#009;${logger}&#009;${message}&#009;${exception:format=tostring}"/>
         <target name="LogFile" xsi:type="File"
-          layout="[${date:format=yyyy-MM-ddTHH:mm:ss.fff}Z] ${level:uppercase=true:padding=5}&#009;${logger}&#009;${message}&#009;${exception:format=tostring}"
+          layout="[${date:format=yyyy-MM-ddTHH\:mm\:ss.fff}Z] ${level:uppercase=true:padding=5}&#009;${logger}&#009;${message}&#009;${exception:format=tostring}"
           fileName="logs\UI\ZitiDesktopEdge.log"
           archiveEvery="Day"
           archiveNumbering="Date"
diff --git a/ZitiUpdateService/ziti-monitor-log.config b/ZitiUpdateService/ziti-monitor-log.config
index 75892860..e19d1cc8 100644
--- a/ZitiUpdateService/ziti-monitor-log.config
+++ b/ZitiUpdateService/ziti-monitor-log.config
@@ -3,9 +3,10 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <targets>
-        <target name="logconsole" xsi:type="Console" />
+        <target name="logconsole" xsi:type="Console"
+          layout="[${date:format=yyyy-MM-ddTHH\:mm\:ss.fff}Z] ${level:uppercase=true:padding=5}&#009;${logger}&#009;${message}&#009;${exception:format=tostring}"/>
         <target name="LogFile" xsi:type="File"
-          layout="[${date:format=yyyy-MM-ddTHH:mm:ss.fff}Z] ${level:uppercase=true:padding=5}&#009;${logger}&#009;${message}&#009;${exception:format=tostring}"
+          layout="[${date:format=yyyy-MM-ddTHH\:mm\:ss.fff}Z] ${level:uppercase=true:padding=5}&#009;${logger}&#009;${message}&#009;${exception:format=tostring}"
           fileName="logs\ZitiMonitorService\ZitiUpdateService.log"
           archiveEvery="Day"
           archiveNumbering="Date"
diff --git a/release-notes.md b/release-notes.md
index 0fb95759..9b42c433 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,33 @@
+# Release 1.5.12
+
+## What's New
+* none
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* fixes [#251](https://github.com/openziti/desktop-edge-win/issues/251) - timestamp in UI and service logs has incorrect format
+
+## Dependency Updates
+
+* none
+
+# Release 1.5.11
+
+## What's New
+* none
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* fixes [#250](https://github.com/openziti/desktop-edge-win/issues/250) - setting the log level for the data service would not work
+
+## Dependency Updates
+
+* none
+
 # Release 1.5.10
 
 ## What's New
diff --git a/version b/version
index df808199..41336a1c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.5.11
+1.5.12