From 63ad37d1dcbcaa34b0f74e486c95cdfa683243d9 Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Wed, 12 Feb 2020 17:34:04 -0800
Subject: [PATCH 1/7] Added telemetry base class and markdown telemetry class

---
 .../MarkDownPreviewHandler.csproj             |  1 +
 .../MarkdownPreviewHandlerControl.cs          |  1 +
 .../MarkdownTelemetry.cs                      | 43 +++++++++++++++++++
 .../common/PreviewHandlerCommon.csproj        |  1 +
 .../common/Telemetry/TelemetryBase.cs         | 41 ++++++++++++++++++
 5 files changed, 87 insertions(+)
 create mode 100644 src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
 create mode 100644 src/modules/previewpane/common/Telemetry/TelemetryBase.cs

diff --git a/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj b/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj
index 889a9927111f..5f0adad69e83 100644
--- a/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj
+++ b/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj
@@ -60,6 +60,7 @@
     <Compile Include="MarkdownPreviewHandlerControl.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="MarkdownTelemetry.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
index 9adf6c8d876d..98ea14c3a2ad 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
@@ -116,6 +116,7 @@ public override void DoPreview<T>(T dataSource)
 
                 this.Resize += this.FormResized;
                 base.DoPreview(dataSource);
+                MarkdownTelemetry.Log.MarkdownFilePreviewed();
             });
         }
 
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
new file mode 100644
index 000000000000..4d485ce3a076
--- /dev/null
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+using PreviewHandlerCommon.Telemetry;
+
+namespace MarkdownPreviewHandler
+{
+    /// <summary>
+    /// Telemetry helper class for markdown renderer.
+    /// </summary>
+    public class MarkdownTelemetry : TelemetryBase
+    {
+        private const string EventSourceName = "Microsoft.PowerToys";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MarkdownTelemetry"/> class.
+        /// </summary>
+        public MarkdownTelemetry()
+            : base(EventSourceName)
+        {
+            return;
+        }
+
+        /// <summary>
+        /// Gets an instance of the <see cref="MarkdownTelemetry"/> class.
+        /// </summary>
+        public static MarkdownTelemetry Log { get; } = new MarkdownTelemetry();
+
+        /// <summary>
+        /// Publishes ETW event when markdown is previewed successfully.
+        /// </summary>
+        public void MarkdownFilePreviewed()
+        {
+            this.Write("PowerPreview_PreviewPane_MDRendererPreviewed", new EventSourceOptions()
+            {
+                Keywords = TelemetryBase.PROJECTKEYWORDMEASURE,
+                Tags = TelemetryBase.ProjectTelemetryTagProductAndServicePerformance,
+            });
+        }
+    }
+}
diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj
index b3d2f9e1e824..e3ea92add2a2 100644
--- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj
+++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="handlers\StreamBasedPreviewHandler.cs" />
     <Compile Include="examplehandler\TestCustomHandler.cs" />
+    <Compile Include="Telemetry\TelemetryBase.cs" />
     <Compile Include="Utilities\StreamWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/modules/previewpane/common/Telemetry/TelemetryBase.cs b/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
new file mode 100644
index 000000000000..64c2a1b84d72
--- /dev/null
+++ b/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Eventing.Reader;
+using System.Diagnostics.Tracing;
+
+namespace PreviewHandlerCommon.Telemetry
+{
+    /// <summary>
+    /// Base class for telemetry events.
+    /// </summary>
+    public class TelemetryBase : EventSource
+    {
+        /// <summary>
+        /// The event tag for this event source.
+        /// </summary>
+        public const EventTags ProjectTelemetryTagProductAndServicePerformance = (EventTags)0x0u;
+
+        /// <summary>
+        /// The event keyword for this event source.
+        /// </summary>
+        public const EventKeywords PROJECTKEYWORDMEASURE = (EventKeywords)0x0;
+
+        private static readonly string[] PowerToysTelemetryTraits = { "ETW_GROUP", "{42749043-438c-46a2-82be-c6cbeb192ff2}" };
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TelemetryBase"/> class.
+        /// </summary>
+        /// <param name="eventSourceName">.</param>
+        public TelemetryBase(
+            string eventSourceName)
+            : base(
+            eventSourceName,
+            EventSourceSettings.EtwSelfDescribingEventFormat,
+            PowerToysTelemetryTraits)
+        {
+            return;
+        }
+    }
+}

From 34b1edd254775ee96d6ed8de313a52197ac27533 Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Thu, 13 Feb 2020 09:32:26 -0800
Subject: [PATCH 2/7] Updated docstring for telemetry event.

---
 .../previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs    | 3 +++
 src/modules/previewpane/common/Telemetry/TelemetryBase.cs      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
index 4d485ce3a076..2580fad0886d 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
@@ -12,6 +12,9 @@ namespace MarkdownPreviewHandler
     /// </summary>
     public class MarkdownTelemetry : TelemetryBase
     {
+        /// <summary>
+        /// Name for ETW event.
+        /// </summary>
         private const string EventSourceName = "Microsoft.PowerToys";
 
         /// <summary>
diff --git a/src/modules/previewpane/common/Telemetry/TelemetryBase.cs b/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
index 64c2a1b84d72..664d8cb97a9e 100644
--- a/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
+++ b/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
@@ -22,6 +22,9 @@ public class TelemetryBase : EventSource
         /// </summary>
         public const EventKeywords PROJECTKEYWORDMEASURE = (EventKeywords)0x0;
 
+        /// <summary>
+        /// Group ID for Powertoys project.
+        /// </summary>
         private static readonly string[] PowerToysTelemetryTraits = { "ETW_GROUP", "{42749043-438c-46a2-82be-c6cbeb192ff2}" };
 
         /// <summary>

From 6f11a33c8cb898135fa5ecbbfccdc85e441a2e3e Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Thu, 13 Feb 2020 10:31:03 -0800
Subject: [PATCH 3/7] Added telemetry to markdown for error

---
 .../Properties/AssemblyInfo.cs                   |  4 ++--
 .../MarkdownPreviewHandler/MarkdownTelemetry.cs  | 16 ++++++++++++++++
 .../common/Properties/AssemblyInfo.cs            |  4 ++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs b/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs
index 9b60e01ac060..5d921a3f7aea 100644
--- a/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs
+++ b/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.8")]
+[assembly: AssemblyFileVersion("1.0.0.8")]
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
index 2580fad0886d..315058e0dba8 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+using System.Windows.Forms;
 using PreviewHandlerCommon.Telemetry;
 
 namespace MarkdownPreviewHandler
@@ -42,5 +43,20 @@ public void MarkdownFilePreviewed()
                 Tags = TelemetryBase.ProjectTelemetryTagProductAndServicePerformance,
             });
         }
+
+        /// <summary>
+        /// Publishes ETW event when markdown could not be previewed.
+        /// </summary>
+        public void MarkdownFilePreviewError(string message)
+        {
+            this.Write(
+                "PowerPreview_PreviewPane_MDRendererError",
+                new EventSourceOptions()
+                {
+                    Keywords = TelemetryBase.PROJECTKEYWORDMEASURE,
+                    Tags = TelemetryBase.ProjectTelemetryTagProductAndServicePerformance,
+                },
+                new { Message = message, });
+        }
     }
 }
diff --git a/src/modules/previewpane/common/Properties/AssemblyInfo.cs b/src/modules/previewpane/common/Properties/AssemblyInfo.cs
index 0afe1c322bbb..418546782834 100644
--- a/src/modules/previewpane/common/Properties/AssemblyInfo.cs
+++ b/src/modules/previewpane/common/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.8")]
+[assembly: AssemblyFileVersion("1.0.0.8")]

From 7681fdc1484d8390e7a596f0b8de47698811fd2f Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Thu, 13 Feb 2020 14:56:22 -0800
Subject: [PATCH 4/7] Added try catch for markdown preview handler and display
 error bar

---
 src/common/Telemetry/PowerToys.wprp           | Bin 1533 -> 393216 bytes
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../MarkdownPreviewHandlerControl.cs          | 102 +++++++++++-------
 .../MarkdownTelemetry.cs                      |   9 +-
 .../Properties/Resources.Designer.cs          |   9 ++
 .../Properties/Resources.resx                 |   4 +
 .../common/Properties/AssemblyInfo.cs         |   4 +-
 7 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/src/common/Telemetry/PowerToys.wprp b/src/common/Telemetry/PowerToys.wprp
index 70ccf172aa159e305ad73bb810820d4e3de03cb2..6f49e9929c852917e29ed8ed70b8b6513894aa75 100644
GIT binary patch
literal 393216
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

literal 1533
zcmb_c(Qbk;6n*zAn!W=X=fngwQ@6xK7qczyaY49X6X2Q_b?)m|g(5Q0W%IGU?LFt7
zb6RWg8HHpETriAn+R~epK<uK&;=rbx#MewZ=r^o)7JIl8bKpMm$cbHe0T;OkoGi{R
zKWvf}a+}VW%Tb`8kP-4Vawm}hR4&$g&Vp5P;Y74{;(cAc-yp=AbM#pV;;@j*$1TLk
z2*VKE1UZ>_Ha*|^$l2&~+yQ^Xy`bdTiJ$;eD5ZU6=i$cpfxogZAPXnl$m92Slo+MD
zP{mWtGR_$knM(Fsc2F)Ss&+2%Y@1-3W^bwWy6u+MY5N@wdd-#wrqgv>-A=pNEx>0A
z9U&@)*QIGo6revz880b8#vokI)(7{hwIWjt0-2T>dQzUW-xv~yg;Ur<XwwXe=Az|J
zW&TxoIPsLE=Q36bq#B?4C_M`RKZ_*{b*B>IWcjgAYOcCbKq=ck@f11BD35I!nMqkT
zvQ@2R)5Ej5g<(TSROh~wifhIm3FWUrJ<3}CDsnT3knjH)x<AdJkSpV<EWSEN>VxW4
Y|B3wK>D+FLq8E9vWH2qG{^#z017v;#*Z=?k

diff --git a/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs b/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs
index 5d921a3f7aea..9b60e01ac060 100644
--- a/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs
+++ b/src/modules/previewpane/MarkDownPreviewHandler/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.8")]
-[assembly: AssemblyFileVersion("1.0.0.8")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
index 98ea14c3a2ad..c775d8a0d320 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
@@ -12,7 +12,6 @@
 using System.Xml.Linq;
 using Common;
 using Markdig;
-using Markdig.Helpers;
 using MarkdownPreviewHandler.Properties;
 
 namespace MarkdownPreviewHandler
@@ -55,7 +54,7 @@ public class MarkdownPreviewHandlerControl : FormHandlerControl
         /// <summary>
         /// True if external image is blocked, false otherwise.
         /// </summary>
-        private bool imagesBlocked = false;
+        private bool infoBarDisplayed = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MarkdownPreviewHandlerControl"/> class.
@@ -75,48 +74,51 @@ public override void DoPreview<T>(T dataSource)
         {
             this.InvokeOnControlThread(() =>
             {
-                this.imagesBlocked = false;
+                try
+                {
+                    this.infoBarDisplayed = false;
 
-                StringBuilder sb = new StringBuilder();
-                string filePath = dataSource as string;
-                string fileText = File.ReadAllText(filePath);
-                this.extension.BaseUrl = Path.GetDirectoryName(filePath);
+                    StringBuilder sb = new StringBuilder();
+                    string filePath = dataSource as string;
+                    string fileText = File.ReadAllText(filePath);
+                    this.extension.BaseUrl = Path.GetDirectoryName(filePath);
 
-                MarkdownPipeline pipeline = this.pipelineBuilder.Build();
-                string parsedMarkdown = Markdown.ToHtml(fileText, pipeline);
-                sb.AppendFormat("{0}{1}{2}", this.htmlHeader, parsedMarkdown, this.htmlFooter);
-                string markdownHTML = this.RemoveScriptFromHTML(sb.ToString());
+                    MarkdownPipeline pipeline = this.pipelineBuilder.Build();
+                    string parsedMarkdown = Markdown.ToHtml(fileText, pipeline);
+                    sb.AppendFormat("{0}{1}{2}", this.htmlHeader, parsedMarkdown, this.htmlFooter);
+                    string markdownHTML = this.RemoveScriptFromHTML(sb.ToString());
 
-                this.browser = new WebBrowser
-                {
-                    DocumentText = markdownHTML,
-                    Dock = DockStyle.Fill,
-                    IsWebBrowserContextMenuEnabled = false,
-                    ScriptErrorsSuppressed = true,
-                    ScrollBarsEnabled = true,
-                };
-                this.browser.Navigating += this.WebBrowserNavigating;
-                this.Controls.Add(this.browser);
-
-                if (this.imagesBlocked)
-                {
-                    this.infoBar = new RichTextBox
+                    this.browser = new WebBrowser
                     {
-                        Text = Resources.BlockedImageInfoText,
-                        BackColor = Color.LightYellow,
-                        Multiline = true,
-                        Dock = DockStyle.Top,
-                        ReadOnly = true,
+                        DocumentText = markdownHTML,
+                        Dock = DockStyle.Fill,
+                        IsWebBrowserContextMenuEnabled = false,
+                        ScriptErrorsSuppressed = true,
+                        ScrollBarsEnabled = true,
                     };
-                    this.infoBar.ContentsResized += this.RTBContentsResized;
-                    this.infoBar.ScrollBars = RichTextBoxScrollBars.None;
-                    this.infoBar.BorderStyle = BorderStyle.None;
+                    this.browser.Navigating += this.WebBrowserNavigating;
+                    this.Controls.Add(this.browser);
+
+                    if (this.infoBarDisplayed)
+                    {
+                        this.infoBar = this.GetTextBoxControl(Resources.BlockedImageInfoText);
+                        this.Controls.Add(this.infoBar);
+                    }
+
+                    this.Resize += this.FormResized;
+                    base.DoPreview(dataSource);
+                    MarkdownTelemetry.Log.MarkdownFilePreviewed();
+                }
+                catch (Exception e)
+                {
+                    MarkdownTelemetry.Log.MarkdownFilePreviewError(e.Message);
+                    this.infoBarDisplayed = true;
+                    this.infoBar = this.GetTextBoxControl(Resources.MarkdownNotPreviewedError);
+                    this.Resize += this.FormResized;
+                    this.Controls.Clear();
                     this.Controls.Add(this.infoBar);
+                    base.DoPreview(dataSource);
                 }
-
-                this.Resize += this.FormResized;
-                base.DoPreview(dataSource);
-                MarkdownTelemetry.Log.MarkdownFilePreviewed();
             });
         }
 
@@ -140,6 +142,28 @@ public string RemoveScriptFromHTML(string html)
             return doc.ToString();
         }
 
+        /// <summary>
+        /// Gets a textbox control.
+        /// </summary>
+        /// <param name="message">Message to be displayed in textbox.</param>
+        /// <returns>An object of type <see cref="RichTextBox"/>.</returns>
+        private RichTextBox GetTextBoxControl(string message)
+        {
+            RichTextBox richTextBox = new RichTextBox
+            {
+                Text = message,
+                BackColor = Color.LightYellow,
+                Multiline = true,
+                Dock = DockStyle.Top,
+                ReadOnly = true,
+            };
+            richTextBox.ContentsResized += this.RTBContentsResized;
+            richTextBox.ScrollBars = RichTextBoxScrollBars.None;
+            richTextBox.BorderStyle = BorderStyle.None;
+
+            return richTextBox;
+        }
+
         /// <summary>
         /// Callback when RichTextBox is resized.
         /// </summary>
@@ -158,7 +182,7 @@ private void RTBContentsResized(object sender, ContentsResizedEventArgs e)
         /// <param name="e">Provides data for the event.</param>
         private void FormResized(object sender, EventArgs e)
         {
-            if (this.imagesBlocked)
+            if (this.infoBarDisplayed)
             {
                 this.infoBar.Width = this.Width;
             }
@@ -169,7 +193,7 @@ private void FormResized(object sender, EventArgs e)
         /// </summary>
         private void ImagesBlockedCallBack()
         {
-            this.imagesBlocked = true;
+            this.infoBarDisplayed = true;
         }
 
         /// <summary>
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
index 315058e0dba8..b3ba97944caf 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
-using System.Windows.Forms;
 using PreviewHandlerCommon.Telemetry;
 
 namespace MarkdownPreviewHandler
@@ -39,8 +38,8 @@ public void MarkdownFilePreviewed()
         {
             this.Write("PowerPreview_PreviewPane_MDRendererPreviewed", new EventSourceOptions()
             {
-                Keywords = TelemetryBase.PROJECTKEYWORDMEASURE,
-                Tags = TelemetryBase.ProjectTelemetryTagProductAndServicePerformance,
+                Keywords = PROJECTKEYWORDMEASURE,
+                Tags = ProjectTelemetryTagProductAndServicePerformance,
             });
         }
 
@@ -53,8 +52,8 @@ public void MarkdownFilePreviewError(string message)
                 "PowerPreview_PreviewPane_MDRendererError",
                 new EventSourceOptions()
                 {
-                    Keywords = TelemetryBase.PROJECTKEYWORDMEASURE,
-                    Tags = TelemetryBase.ProjectTelemetryTagProductAndServicePerformance,
+                    Keywords = PROJECTKEYWORDMEASURE,
+                    Tags = ProjectTelemetryTagProductAndServicePerformance,
                 },
                 new { Message = message, });
         }
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.Designer.cs b/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.Designer.cs
index 65505e0aca13..ea7599efd60a 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.Designer.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.Designer.cs
@@ -68,5 +68,14 @@ internal static string BlockedImageInfoText {
                 return ResourceManager.GetString("BlockedImageInfoText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The markdown could not be preview due to an internal error..
+        /// </summary>
+        internal static string MarkdownNotPreviewedError {
+            get {
+                return ResourceManager.GetString("MarkdownNotPreviewedError", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.resx b/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.resx
index 0eabfcdae9ff..9beb635bd91e 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.resx
+++ b/src/modules/previewpane/MarkdownPreviewHandler/Properties/Resources.resx
@@ -121,4 +121,8 @@
     <value>Some pictures have been blocked to help prevent the sender from identifying this computer. Open this item to view pictures.</value>
     <comment>This text is displayed if image is blocked from being displayed.</comment>
   </data>
+  <data name="MarkdownNotPreviewedError" xml:space="preserve">
+    <value>The markdown could not be preview due to an internal error.</value>
+    <comment>This text is displayed if markdown fails to preview</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/previewpane/common/Properties/AssemblyInfo.cs b/src/modules/previewpane/common/Properties/AssemblyInfo.cs
index 418546782834..0afe1c322bbb 100644
--- a/src/modules/previewpane/common/Properties/AssemblyInfo.cs
+++ b/src/modules/previewpane/common/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.8")]
-[assembly: AssemblyFileVersion("1.0.0.8")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

From d7f698ea62497c79f17e8d8a9cc14e64301f1552 Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Thu, 13 Feb 2020 16:27:04 -0800
Subject: [PATCH 5/7] Updated markdown telemetry to make event names global
 variable

---
 .../MarkdownPreviewHandler/MarkdownTelemetry.cs    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
index b3ba97944caf..f3e6ef7e394d 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
@@ -17,6 +17,16 @@ public class MarkdownTelemetry : TelemetryBase
         /// </summary>
         private const string EventSourceName = "Microsoft.PowerToys";
 
+        /// <summary>
+        /// ETW event name when markdown is previewed.
+        /// </summary>
+        private const string MarkdownFilePreviewedEventName = "PowerPreview_PreviewPane_MDRendererPreviewed";
+
+        /// <summary>
+        /// ETW event name when error is thrown during markdown preview.
+        /// </summary>
+        private const string MarkdownFilePreviewErrorEventName = "PowerPreview_PreviewPane_MDRendererError";
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MarkdownTelemetry"/> class.
         /// </summary>
@@ -36,7 +46,7 @@ public MarkdownTelemetry()
         /// </summary>
         public void MarkdownFilePreviewed()
         {
-            this.Write("PowerPreview_PreviewPane_MDRendererPreviewed", new EventSourceOptions()
+            this.Write(MarkdownFilePreviewedEventName, new EventSourceOptions()
             {
                 Keywords = PROJECTKEYWORDMEASURE,
                 Tags = ProjectTelemetryTagProductAndServicePerformance,
@@ -49,7 +59,7 @@ public void MarkdownFilePreviewed()
         public void MarkdownFilePreviewError(string message)
         {
             this.Write(
-                "PowerPreview_PreviewPane_MDRendererError",
+                MarkdownFilePreviewErrorEventName,
                 new EventSourceOptions()
                 {
                     Keywords = PROJECTKEYWORDMEASURE,

From d4fe2fae6818c8f6d8adff175abb413340114a01 Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Fri, 14 Feb 2020 11:43:10 -0800
Subject: [PATCH 6/7] Updated parameter name to camel casing and telemetry
 event name naming.

---
 .../MarkdownPreviewHandler/MarkdownTelemetry.cs           | 8 ++++----
 .../SvgPreviewHandler/Properties/AssemblyInfo.cs          | 4 ++--
 src/modules/previewpane/common/Telemetry/TelemetryBase.cs | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
index f3e6ef7e394d..07bf17cd242a 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownTelemetry.cs
@@ -20,12 +20,12 @@ public class MarkdownTelemetry : TelemetryBase
         /// <summary>
         /// ETW event name when markdown is previewed.
         /// </summary>
-        private const string MarkdownFilePreviewedEventName = "PowerPreview_PreviewPane_MDRendererPreviewed";
+        private const string MarkdownFilePreviewedEventName = "PowerPreview_MDRenderer_Previewed";
 
         /// <summary>
         /// ETW event name when error is thrown during markdown preview.
         /// </summary>
-        private const string MarkdownFilePreviewErrorEventName = "PowerPreview_PreviewPane_MDRendererError";
+        private const string MarkdownFilePreviewErrorEventName = "PowerPreview_MDRenderer_Error";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MarkdownTelemetry"/> class.
@@ -48,7 +48,7 @@ public void MarkdownFilePreviewed()
         {
             this.Write(MarkdownFilePreviewedEventName, new EventSourceOptions()
             {
-                Keywords = PROJECTKEYWORDMEASURE,
+                Keywords = ProjectKeywordMeasure,
                 Tags = ProjectTelemetryTagProductAndServicePerformance,
             });
         }
@@ -62,7 +62,7 @@ public void MarkdownFilePreviewError(string message)
                 MarkdownFilePreviewErrorEventName,
                 new EventSourceOptions()
                 {
-                    Keywords = PROJECTKEYWORDMEASURE,
+                    Keywords = ProjectKeywordMeasure,
                     Tags = ProjectTelemetryTagProductAndServicePerformance,
                 },
                 new { Message = message, });
diff --git a/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs b/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs
index 0bc87e35c8eb..8c7fe1213d0e 100644
--- a/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs
+++ b/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.15")]
+[assembly: AssemblyFileVersion("1.0.0.15")]
diff --git a/src/modules/previewpane/common/Telemetry/TelemetryBase.cs b/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
index 664d8cb97a9e..1440aec9d620 100644
--- a/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
+++ b/src/modules/previewpane/common/Telemetry/TelemetryBase.cs
@@ -20,7 +20,7 @@ public class TelemetryBase : EventSource
         /// <summary>
         /// The event keyword for this event source.
         /// </summary>
-        public const EventKeywords PROJECTKEYWORDMEASURE = (EventKeywords)0x0;
+        public const EventKeywords ProjectKeywordMeasure = (EventKeywords)0x0;
 
         /// <summary>
         /// Group ID for Powertoys project.

From fbbb99f42616f0dc1daf843b86d1f02d54acee6c Mon Sep 17 00:00:00 2001
From: Divyansh <somm14divi@gmail.com>
Date: Fri, 14 Feb 2020 12:00:47 -0800
Subject: [PATCH 7/7] Corrected assembbly version for svg renderer

---
 .../previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs b/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs
index 8c7fe1213d0e..0bc87e35c8eb 100644
--- a/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs
+++ b/src/modules/previewpane/SvgPreviewHandler/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.15")]
-[assembly: AssemblyFileVersion("1.0.0.15")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]