From 154dc555c50fbe7df3c45aae7eb4fffa2419e22c Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 22:03:48 +0200
Subject: [PATCH 01/23] Remove underline from sidepanel hyperlink buttons

---
 .../Strings/en-us/Resources.resw              | 14 +++++-----
 .../Views/FancyZonesPage.xaml                 |  9 ++++---
 .../Views/GeneralPage.xaml                    | 27 +++++++++++--------
 .../Views/ImageResizerPage.xaml               | 11 ++++----
 .../Views/KeyboardManagerPage.xaml            |  8 +++++-
 .../Views/PowerLauncherPage.xaml              |  8 +++++-
 .../Views/PowerPreviewPage.xaml               | 10 ++++---
 .../Views/PowerRenamePage.xaml                | 10 ++++---
 .../Views/ShortcutGuidePage.xaml              | 10 ++++---
 9 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 792170b70b..960583d673 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -314,10 +314,10 @@
   <data name="FancyZones_ZoneSetChangeMoveWindows.Content" xml:space="preserve">
     <value>During zone layout changes, windows assigned to a zone will match new size/positions</value>
   </data>
-  <data name="Give_Feedback.Content" xml:space="preserve">
+  <data name="Give_Feedback.Text" xml:space="preserve">
     <value>Give feedback</value>
   </data>
-  <data name="Module_overview.Content" xml:space="preserve">
+  <data name="Module_overview.Text" xml:space="preserve">
     <value>Module overview</value>
   </data>
   <data name="AttributionTitle.Text" xml:space="preserve">
@@ -329,7 +329,7 @@
   <data name="GeneralPage_CheckForUpdates.Content" xml:space="preserve">
     <value>Check for updates</value>
   </data>
-  <data name="GeneralPage_PrivacyStatement_URL.Content" xml:space="preserve">
+  <data name="GeneralPage_PrivacyStatement_URL.Text" xml:space="preserve">
     <value>Privacy statement</value>
   </data>
   <data name="GeneralPage_Radio_Theme_Dark.Content" xml:space="preserve">
@@ -341,10 +341,10 @@
   <data name="GeneralPage_Radio_Theme_Light.Content" xml:space="preserve">
     <value>Light</value>
   </data>
-  <data name="GeneralPage_ReportAbug.Content" xml:space="preserve">
+  <data name="GeneralPage_ReportAbug.Text" xml:space="preserve">
     <value>Report a bug</value>
   </data>
-  <data name="GeneralPage_RequestAFeature_URL.Content" xml:space="preserve">
+  <data name="GeneralPage_RequestAFeature_URL.Text" xml:space="preserve">
     <value>Request a feature</value>
   </data>
   <data name="GeneralPage_RestartAsAdmin_Button.Content" xml:space="preserve">
@@ -392,7 +392,7 @@
   <data name="Miscellaneous.Text" xml:space="preserve">
     <value>Miscellaneous</value>
   </data>
-  <data name="OpenSource_Notice.Content" xml:space="preserve">
+  <data name="OpenSource_Notice.Text" xml:space="preserve">
     <value>Open-source notice</value>
   </data>
   <data name="PowerRename_Toggle_AutoComplete.Header" xml:space="preserve">
@@ -527,7 +527,7 @@
   <data name="GeneralPage_ToggleSwitch_AlwaysRunElevated.Header" xml:space="preserve">
     <value>Always Run as Admin</value>
   </data>
-  <data name="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link.Content" xml:space="preserve">
+  <data name="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link.Text" xml:space="preserve">
     <value>Learn about Admin mode</value>
   </data>
   <data name="GeneralPage_ToggleSwitch_AutoDownloadUpdates.Header" xml:space="preserve">
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index 5db9ab5525..d295c7f6cc 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -228,10 +228,13 @@
             
             <Image Source="https://user-images.githubusercontent.com/9866362/77859136-f04ae880-7207-11ea-8a7f-4295342fe319.gif" />
 
-            <HyperlinkButton x:Uid="Module_overview"
-                             NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md">
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback" NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
             <!--
             <TextBlock Text="Contributors"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index 2ce666bc13..507f3177ce 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -115,21 +115,26 @@
                     Command = "{Binding CheckFoUpdatesEventHandler, Source={StaticResource eventViewModel}}"
                     />
 
-            <HyperlinkButton x:Uid="GeneralPage_ReportAbug"
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"
-                             Margin="{StaticResource SmallTopMargin}" />
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues"
+                             Margin="{StaticResource SmallTopMargin}">
+                <TextBlock x:Uid="GeneralPage_ReportAbug"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="GeneralPage_RequestAFeature_URL" 
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="GeneralPage_RequestAFeature_URL"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="GeneralPage_PrivacyStatement_URL"
-                             NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839" />
+            <HyperlinkButton NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839">
+                <TextBlock x:Uid="GeneralPage_PrivacyStatement_URL"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="OpenSource_Notice"
-                             NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md">
+                <TextBlock x:Uid="OpenSource_Notice"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"
-                             NavigateUri="https://github.com/microsoft/PowerToys/blob/master/doc/devdocs/run-as-admin-detection.md"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/doc/devdocs/run-as-admin-detection.md">
+                <TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 345138a106..f610004c49 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -272,12 +272,13 @@
                 Style="{StaticResource SettingsGroupTitleStyle}"
                 Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton 
-                x:Uid="Module_overview"
-                NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/imageresizer/README.md"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/imageresizer/README.md">
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback"
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
             <TextBlock 
                 x:Uid="AttributionTitle"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index b1efe75cff..d5b1f0727e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -208,7 +208,13 @@
                 Style="{StaticResource SettingsGroupTitleStyle}"
                 Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton Content="Module overview"/>
+            <HyperlinkButton>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index 8b42d44348..d1aeeb724e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -141,7 +141,13 @@
                 Style="{StaticResource SettingsGroupTitleStyle}"
                 Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton Content="Module overview"/>
+            <HyperlinkButton>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
             <TextBlock 
                 Text="Attribution"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
index d314e36378..19e6380b1d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
@@ -63,11 +63,13 @@
                        Style="{StaticResource SettingsGroupTitleStyle}"
                        Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton x:Uid="Module_overview"
-                             NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/previewpane"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/previewpane">
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback"
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
index 9d9922b3b2..ce64675b37 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -100,11 +100,13 @@
                        Style="{StaticResource SettingsGroupTitleStyle}"
                        Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton x:Uid="Module_overview"
-                             NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/powerrename"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/powerrename">
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback"
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
 
             <TextBlock 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index 204ece0f89..a372093b12 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -97,9 +97,13 @@
 
             <Image Source="https://raw.githubusercontent.com/microsoft/PowerToys/dev/build-features/doc/images/shortcut_guide/usage.png" />
 
-            <HyperlinkButton 
-                x:Uid="Module_overview"
-                NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md">
+                <TextBlock x:Uid="Module_overview"/>
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file

From b0bc57466e07607bfeabd223c84ee4f2d5c77bc8 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 22:13:19 +0200
Subject: [PATCH 02/23] Fixed inconsistency of the Image Resizer enable
 toggleswitch

---
 .../Strings/en-us/Resources.resw                         | 3 ---
 .../Views/ImageResizerPage.xaml                          | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 960583d673..1ef12c9ae2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -431,9 +431,6 @@
   <data name="ImageResizer_Description.Text" xml:space="preserve">
     <value>Lets you resize images by right-clicking.</value>
   </data>
-  <data name="ImageResizer_EnableGroupSettingsHeader.Text" xml:space="preserve">
-    <value>Enable</value>
-  </data>
   <data name="ImageResizer_EnableToggle.Header" xml:space="preserve">
     <value>Enable Image Resizer</value>
   </data>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index f610004c49..727f2495b5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -50,11 +50,7 @@
             <TextBlock x:Uid="ImageResizer_Description"
                        TextWrapping="Wrap"/>
 
-            <TextBlock x:Uid="ImageResizer_EnableGroupSettingsHeader"
-                       Style="{StaticResource SettingsGroupTitleStyle}"/>
-
-            <!--x:Uid="ImageResizer_EnableToggle"-->
-            <ToggleSwitch IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
+            <ToggleSwitch x:Uid="ImageResizer_EnableToggle" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
                           Margin="{StaticResource SmallTopMargin}" />
 
             <TextBlock x:Uid="ImageResizer_CustomSizes"
@@ -65,8 +61,7 @@
                       ItemsSource="{Binding Sizes, Mode=TwoWay, Source={StaticResource ViewModel}}"
                       Padding="0"
                       IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
-                      Margin="0"
-                      >
+                      Margin="0">
 
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">

From e66e5e6f6efd9b27b3c0585e270ccdf6c8b0d717 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 22:47:59 +0200
Subject: [PATCH 03/23] Fixed visual inconsistency for the image resizer sizes
 listview

---
 .../Views/ImageResizerPage.xaml               | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 727f2495b5..f2d7de864c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -50,8 +50,7 @@
             <TextBlock x:Uid="ImageResizer_Description"
                        TextWrapping="Wrap"/>
 
-            <ToggleSwitch x:Uid="ImageResizer_EnableToggle" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
-                          Margin="{StaticResource SmallTopMargin}" />
+            <ToggleSwitch x:Uid="ImageResizer_EnableToggle" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"/>
 
             <TextBlock x:Uid="ImageResizer_CustomSizes"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
@@ -60,8 +59,10 @@
             <ListView x:Name="ImagesSizesListView" 
                       ItemsSource="{Binding Sizes, Mode=TwoWay, Source={StaticResource ViewModel}}"
                       Padding="0"
-                      IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
-                      Margin="0">
+                   
+                      Margin="0"
+                      SelectionMode="None"
+                      >
 
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">
@@ -95,15 +96,17 @@
                 </ListView.ItemContainerStyle>
                 <ListView.ItemTemplate>
                     <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize" >
-                        <StackPanel Orientation="Horizontal" Padding="0" Spacing="4">
+                        <StackPanel Orientation="Horizontal" Height="48" Padding="0" Spacing="4">
                             <TextBox Text="{x:Bind Path=Name, Mode=TwoWay}" 
-                                     Width="90" 
-                                     Height="35" 
+                                     Width="90"
+                                     VerticalAlignment="Center"
+                                     Height="34"
                                      Margin="{StaticResource SmallTopMargin}"/>
 
                             <ComboBox SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}"
-                                      Width="90" 
-                                      Height="35"
+                                      Width="90"
+                                      VerticalAlignment="Center"
+                                      Height="34"
                                       Margin="{StaticResource SmallTopMargin}">
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fill" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fit" />
@@ -113,37 +116,42 @@
                             <muxc:NumberBox Value="{x:Bind Path=Width, Mode=TwoWay}" 
                                             Width="68"
                                             Height="34"
+                                            VerticalAlignment="Center"
                                             Margin="{StaticResource SmallTopMargin}"/>
 
-                            <TextBlock Text="x" 
-                                       FontWeight="SemiBold" 
-                                       TextAlignment="Center" 
+                            <TextBlock Text="&#xE711;"
+                                       FontFamily="Segoe MDL2 Assets"
+                                       TextAlignment="Center"
+                                       VerticalAlignment="Center"
                                        Margin="{StaticResource SmallTopMargin}" 
-                                       Width="25" 
-                                       Height="35"/>
+                                       Width="25"/>
 
                             <muxc:NumberBox Value="{x:Bind Path=Height, Mode=TwoWay}" 
-                                            Width="68" 
+                                            Width="68"
                                             Height="34"
+                                            VerticalAlignment="Center"
                                             Margin="{StaticResource SmallTopMargin}"/>
 
                             <ComboBox SelectedIndex="{Binding Path=Unit, Mode=TwoWay}"
-                                      Width="90" 
-                                      Height="35"
+                                      Width="90"
+                                      Height="34"
+                                      VerticalAlignment="Center"
                                       Margin="{StaticResource SmallTopMargin}">
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Pixels" />
                             </ComboBox>
-                            <AppBarButton x:Name="RemoveButton" 
+                            <Button x:Name="RemoveButton" 
                                           Background="Transparent" 
                                           Command = "{Binding DeleteImageSizeEventHandler, Source={StaticResource ViewModel}}"
                                           CommandParameter="{Binding Id}"                                          
-                                          Icon="Delete" 
-                                          Width="52" 
-                                          Height="32"
-                                          Margin="{StaticResource SmallTopMargin}" Padding="0,0,50,100" UseLayoutRounding="False"/>
+                                          FontFamily="Segoe MDL2 Assets"
+                                          Height="34"
+                                          Width="34"
+                                          Content="&#xE74D;"
+                                          VerticalAlignment="Center"
+                                          Margin="{StaticResource SmallTopMargin}" UseLayoutRounding="False"/>
                         </StackPanel>
                     </DataTemplate>
                 </ListView.ItemTemplate>

From 3f6120e1229e10806d5be046e067102f585c9c96 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 22:58:48 +0200
Subject: [PATCH 04/23] Tweaked the vertical spacing of the module description
 so the module toggle switch stands out a bit more.

---
 .../Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml | 2 +-
 .../Views/ImageResizerPage.xaml                               | 4 +++-
 .../Views/KeyboardManagerPage.xaml                            | 2 +-
 .../Views/PowerLauncherPage.xaml                              | 3 +--
 .../Views/PowerPreviewPage.xaml                               | 2 +-
 .../Views/PowerRenamePage.xaml                                | 2 +-
 .../Views/ShortcutGuidePage.xaml                              | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index d295c7f6cc..f8ea4e2331 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -53,7 +53,7 @@
 
             <ToggleSwitch x:Uid="FancyZones_EnableToggleControl_HeaderText"
                           IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                          Margin="{StaticResource SmallTopMargin}" />
+                          Margin="{StaticResource MediumTopMargin}" />
 
             <TextBlock x:Uid="FancyZones_ZoneBehavior_GroupSettings"
                        Style="{StaticResource SettingsGroupTitleStyle}"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index f2d7de864c..d3c60e4143 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -50,7 +50,9 @@
             <TextBlock x:Uid="ImageResizer_Description"
                        TextWrapping="Wrap"/>
 
-            <ToggleSwitch x:Uid="ImageResizer_EnableToggle" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"/>
+            <ToggleSwitch x:Uid="ImageResizer_EnableToggle"
+                          Margin="{StaticResource MediumTopMargin}"
+                          IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"/>
 
             <TextBlock x:Uid="ImageResizer_CustomSizes"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index d5b1f0727e..05380caa5b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -121,7 +121,7 @@
 
             <ToggleSwitch x:Uid="KeyboardManager_EnableToggle"
                           IsOn="{x:Bind Path=ViewModel.Enabled, Mode=TwoWay}"
-                          Margin="{StaticResource SmallTopMargin}" />
+                          Margin="{StaticResource MediumTopMargin}" />
 
             <!--<TextBlock x:Uid="KeyboardManager_ConfigHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index d1aeeb724e..b3009938db 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -44,12 +44,11 @@
 
         <StackPanel Orientation="Vertical">
             <TextBlock x:Uid="PowerLauncher_Description"
-                       Style="{StaticResource BodyTextBlockStyle}"
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="PowerLauncher_EnablePowerLauncher" 
                           IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnablePowerLauncher}"
-                          Margin="{StaticResource SmallTopMargin}"/>
+                          Margin="{StaticResource MediumTopMargin}"/>
 
             <TextBlock x:Uid="PowerLauncher_SearchResults"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
index 19e6380b1d..db90160eeb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
@@ -45,7 +45,7 @@
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="FileEplorerPreview_ToggleSwitch_Preview_SVG"
-                          Margin="{StaticResource SmallTopMargin}"
+                          Margin="{StaticResource MediumTopMargin}"
                           IsOn="{Binding Mode=TwoWay, Path=SVGRenderIsEnabled}" />
 
             <ToggleSwitch x:Uid="FileEplorerPreview_ToggleSwitch_Preview_MD"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
index ce64675b37..c0968452c7 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -46,7 +46,7 @@
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="PowerRename_Toggle_Enable"
-                          Margin="{StaticResource SmallTopMargin}" 
+                          Margin="{StaticResource MediumTopMargin}" 
                           IsOn="{Binding Mode=TwoWay, Path=IsEnabled}"                          
                            />
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index a372093b12..272fa9dadd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -46,7 +46,7 @@
 
             <ToggleSwitch x:Uid="ShortcutGuide_Enable"
                           IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                          Margin="{StaticResource SmallTopMargin}"/>
+                          Margin="{StaticResource MediumTopMargin}"/>
 
             <TextBlock x:Uid="ShortcutGuide_Appearance_Behavior" 
                        Style="{StaticResource SettingsGroupTitleStyle}"/>

From e59e3019e339c9c47e4a47db177490268aef90b3 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 23:03:34 +0200
Subject: [PATCH 05/23] Typo fix

---
 .../Views/ImageResizerPage.xaml                              | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index d3c60e4143..533d9e5d9e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -61,10 +61,9 @@
             <ListView x:Name="ImagesSizesListView" 
                       ItemsSource="{Binding Sizes, Mode=TwoWay, Source={StaticResource ViewModel}}"
                       Padding="0"
-                   
+                      IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
                       Margin="0"
-                      SelectionMode="None"
-                      >
+                      SelectionMode="None">
 
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">

From 7a8f5a606c85db51593471ccde5c46a6f466b88d Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 23:19:21 +0200
Subject: [PATCH 06/23] Removed underline of the attribution links

---
 .../Views/ImageResizerPage.xaml                      |  6 +++---
 .../Views/PowerLauncherPage.xaml                     | 12 ++++++------
 .../Views/PowerRenamePage.xaml                       |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 533d9e5d9e..b1fb91a767 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -289,9 +289,9 @@
                 Style="{StaticResource SettingsGroupTitleStyle}" />
 
             <HyperlinkButton 
-                Content="Brice Lambson" 
-                NavigateUri="https://github.com/bricelam/ImageResizer/" />
-
+                NavigateUri="https://github.com/bricelam/ImageResizer/">
+                <TextBlock Text="Brice Lambson's SmartRenamer" TextWrapping="Wrap" />
+            </HyperlinkButton>
         </StackPanel>
 
     </Grid>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index b3009938db..abf7fbf504 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -152,13 +152,13 @@
                 Text="Attribution"
                 Style="{StaticResource SettingsGroupTitleStyle}" />
 
-            <HyperlinkButton 
-                Content="Wox" 
-                NavigateUri="https://github.com/Wox-launcher/Wox/" />
+            <HyperlinkButton NavigateUri="https://github.com/Wox-launcher/Wox/">
+                <TextBlock Text="Wox"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton 
-                Content="Beta Tadele's Window Walker" 
-                NavigateUri="https://github.com/betsegaw/windowwalker/" />
+            <HyperlinkButton NavigateUri="https://github.com/betsegaw/windowwalker/">
+                <TextBlock Text="Beta Tadele's Window Walker" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
index c0968452c7..108ee50799 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -114,8 +114,9 @@
                 Style="{StaticResource SettingsGroupTitleStyle}" />
 
             <HyperlinkButton 
-                Content="Chris Davis's SmartRenamer" 
-                NavigateUri="https://github.com/chrdavis/SmartRename" />
+                NavigateUri="https://github.com/chrdavis/SmartRename">
+                <TextBlock Text="Chris Davis's SmartRenamer" TextWrapping="Wrap" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file

From 7f3fae5a0218552838ae04664c6a312ec8416229 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 5 May 2020 23:43:56 +0200
Subject: [PATCH 07/23] Re-order of the autocomplete setting (for Image
 resizer) under the right section

---
 .../Views/PowerRenamePage.xaml                      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
index 108ee50799..c370a5d516 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -50,12 +50,6 @@
                           IsOn="{Binding Mode=TwoWay, Path=IsEnabled}"                          
                            />
 
-            <ToggleSwitch x:Uid="PowerRename_Toggle_AutoComplete"
-                          Margin="{StaticResource SmallTopMargin}" 
-                          IsOn="{Binding Mode=TwoWay, Path=MRUEnabled}"
-                          IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                           />
-
             <TextBlock  x:Uid="PowerRename_ShellIntergration"
                         Style="{StaticResource SettingsGroupTitleStyle}"/>
 
@@ -74,6 +68,13 @@
             <TextBlock x:Uid="Miscellaneous" 
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
+
+            <ToggleSwitch x:Uid="PowerRename_Toggle_AutoComplete"
+                          Margin="{StaticResource SmallTopMargin}" 
+                          IsOn="{Binding Mode=TwoWay, Path=MRUEnabled}"
+                          IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
+                           />
+            
             <ToggleSwitch x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
                           Margin="{StaticResource SmallTopMargin}" 
                           IsOn="{Binding Mode=TwoWay, Path=RestoreFlagsOnLaunch}"

From d5090ee24b528fd83c6848af03c583ce81183e2d Mon Sep 17 00:00:00 2001
From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com>
Date: Wed, 6 May 2020 08:34:26 -0700
Subject: [PATCH 08/23] KBM - Fix all descriptions and text and minor UI tweaks
 (#2705)

* Add new text for Remap Keyboard

* Added text in KBM windows

* Tweaked KBM landing page view

* Changed to transparent background

* Tweaked text

* Tweaked text
---
 .../Views/KeyboardManagerPage.xaml                  |  8 ++++----
 .../keyboardmanager/ui/EditKeyboardWindow.cpp       |  9 ++++++++-
 .../keyboardmanager/ui/EditShortcutsWindow.cpp      | 13 +++++++++++++
 src/modules/keyboardmanager/ui/ShortcutControl.cpp  |  1 +
 .../keyboardmanager/ui/SingleKeyRemapControl.cpp    |  1 +
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index b1efe75cff..426c8e3ade 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -139,13 +139,13 @@
             <TextBlock x:Uid="KeyboardManager_RemapKeyboardHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <TextBlock Text="Description of the Remap Keyboard (subfeature)"
+            <TextBlock Text="Click below to remap a single key to another key"
                        Margin="{StaticResource SmallTopMargin}"
                        TextWrapping="Wrap"/>
 
             <Button x:Uid="KeyboardManager_RemapKeyboardButton"
                     Margin="{StaticResource SmallTopMargin}"
-                    Style="{StaticResource ButtonRevealStyle}"
+                    Style="{StaticResource AccentButtonStyle}"
                     Command="{Binding Path=RemapKeyboardCommand}"
                     IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>
 
@@ -169,12 +169,12 @@
             <TextBlock x:Uid="KeyboardManager_RemapShortcutsHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <TextBlock Text="Description of the Remap Shortcuts (subfeature)"
+            <TextBlock Text="Click below to remap a shortcut (hotkey) to another shortcut"
                        TextWrapping="Wrap" Margin="{StaticResource SmallTopMargin}"/>
 
             <Button x:Uid="KeyboardManager_RemapShortcutsButton"
                     Margin="{StaticResource SmallTopMargin}"
-                    Style="{StaticResource ButtonRevealStyle}"
+                    Style="{StaticResource AccentButtonStyle}"
                     Command="{Binding Path=EditShortcutCommand}"
                     IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"
                     />
diff --git a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp
index a0a7dd70d4..04eba2cd5d 100644
--- a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp
+++ b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp
@@ -96,8 +96,14 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
 
     //  Text block for information about remap key section.
     TextBlock keyRemapInfoHeader;
-    keyRemapInfoHeader.Text(L"Select the key you want to remap, original key, and it's new output when pressed, the new key");
+    keyRemapInfoHeader.Text(L"Select the key you want to change (Original Key) and the key you want it to become (New Key).");
     keyRemapInfoHeader.Margin({ 10, 0, 0, 10 });
+    keyRemapInfoHeader.FontWeight(Text::FontWeights::SemiBold());
+
+    TextBlock keyRemapInfoExample;
+    keyRemapInfoExample.Text(L"For example, if you want to press A and get B, Key A would be your \"Original Key\" and Key B would be your \"New Key\".");
+    keyRemapInfoExample.Margin({ 10, 0, 0, 20 });
+    keyRemapInfoExample.FontStyle(Text::FontStyle::Italic);
 
     // Table to display the key remaps
     Grid keyRemapTable;
@@ -304,6 +310,7 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
 
     StackPanel mappingsPanel;
     mappingsPanel.Children().Append(keyRemapInfoHeader);
+    mappingsPanel.Children().Append(keyRemapInfoExample);
     mappingsPanel.Children().Append(keyRemapTable);
     mappingsPanel.Children().Append(addRemapKey);
 
diff --git a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp
index afc159389f..6c6473e06c 100644
--- a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp
+++ b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp
@@ -95,6 +95,17 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
         PostMessage(_hWndEditShortcutsWindow, WM_CLOSE, 0, 0);
     });
 
+    //  Text block for information about remap key section.
+    TextBlock shortcutRemapInfoHeader;
+    shortcutRemapInfoHeader.Text(L"Select shortcut you want to change (Original Shortcut) and the shortcut (New Shortcut) you want it to invoke.");
+    shortcutRemapInfoHeader.Margin({ 10, 0, 0, 10 });
+    shortcutRemapInfoHeader.FontWeight(Text::FontWeights::SemiBold());
+
+    TextBlock shortcutRemapInfoExample;
+    shortcutRemapInfoExample.Text(L"For example, if you want Ctrl+C to paste, Ctrl+C is the Original Shortcut and Ctrl+V is the New Shortcut.");
+    shortcutRemapInfoExample.Margin({ 10, 0, 0, 20 });
+    shortcutRemapInfoExample.FontStyle(Text::FontStyle::Italic);
+
     // Table to display the shortcuts
     Windows::UI::Xaml::Controls::Grid shortcutTable;
     ColumnDefinition firstColumn;
@@ -228,6 +239,8 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
     });
 
     StackPanel mappingsPanel;
+    mappingsPanel.Children().Append(shortcutRemapInfoHeader);
+    mappingsPanel.Children().Append(shortcutRemapInfoExample);
     mappingsPanel.Children().Append(shortcutTable);
     mappingsPanel.Children().Append(addShortcut);
 
diff --git a/src/modules/keyboardmanager/ui/ShortcutControl.cpp b/src/modules/keyboardmanager/ui/ShortcutControl.cpp
index 254cce47e6..6323ed7442 100644
--- a/src/modules/keyboardmanager/ui/ShortcutControl.cpp
+++ b/src/modules/keyboardmanager/ui/ShortcutControl.cpp
@@ -40,6 +40,7 @@ void ShortcutControl::AddNewShortcutControlRow(Grid& parent, std::vector<std::ve
     deleteSymbol.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
     deleteSymbol.Glyph(L"\xE74D");
     deleteShortcut.Content(deleteSymbol);
+    deleteShortcut.Background(Media::SolidColorBrush(Colors::Transparent()));
     deleteShortcut.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
         Button currentButton = sender.as<Button>();
         uint32_t index;
diff --git a/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp b/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp
index 422482e04a..3cb45f81f8 100644
--- a/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp
+++ b/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp
@@ -63,6 +63,7 @@ void SingleKeyRemapControl::AddNewControlKeyRemapRow(Grid& parent, std::vector<s
     deleteSymbol.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
     deleteSymbol.Glyph(L"\xE74D");
     deleteRemapKeys.Content(deleteSymbol);
+    deleteRemapKeys.Background(Media::SolidColorBrush(Colors::Transparent()));
     deleteRemapKeys.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
         Button currentButton = sender.as<Button>();
         uint32_t index;

From 63f1429a69b355bf484c33a4e837cb3d9bc9dc70 Mon Sep 17 00:00:00 2001
From: Alekhya <reddykalekhya@gmail.com>
Date: Wed, 6 May 2020 12:49:34 -0700
Subject: [PATCH 09/23] Fix incorrect merge which had reverted some parts of
 the Microsoft.Launcher.rc file (#2728)

* Had reverted the changes made in the Microsoft.Launcher.rc file by mistake while resolving merge conflicts

* reverted company name to how it was before
---
 .../Microsoft.Launcher/Microsoft.Launcher.rc  | Bin 2004 -> 2154 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc
index c870c17192615e4299b13d3341781a8cbf306e5b..a9f7e45937d3a949c4316dd0b36567b648a17a8f 100644
GIT binary patch
delta 429
zcmcb@|4Lwjfuk}*CPN-WGD8kSDMJcFDuV)p5`!KP>Z6d!4EYSXK$s6ytItpdR9D1M
z4AcqaPgG534FYP;n>hQYxEq5fgAao%Lp(zmkPKo72J-zG{3b7CRFw??^8FcH7(yAG
z8A32r$TCT8e#7{QQQR4*$d@62!I8m_Arh#}56JRmaGhMpVmw)gMNZHcXl*jk`h1`R
z@)^<?N+$cWC^ISm<=s_rSPwKM7-(e>&@p}t?m(5=lfSSi2xFMUpf|BwadI7t+~f#W
zC25dD0)S2cX>(`r0K3@_C>8>CjP~SbtQuGxBg~eH%iwuz4%&DF0mGf5lf~GDfOsDO
DwW3(G

delta 279
zcmaDQaD{(@!Ni)F$%|MOCcb;YYrvqxU<kw@+F<fqMpaai&H7B-OwvjW&J6hsxeNsi
zi41uRl?)0Den3_(Ln?#P<Up1{)^MO~#pFgd;mOBX1SSWu7)|D472#C^8mb30Tn|J~
zzQ`;&*?^5>assO!LOml$zxLz@tV)g$I|_iN7cpcqq%&kNlmP9~0NShxq>X@P7&2G_
eS@>L{J=udz18#aMoFxpk$AVo6i>qd_UjP7uTRVOL


From 07cf527ddf777aa7ec4f270af4aeeaab802a9e48 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Mon, 4 May 2020 11:41:32 -0700
Subject: [PATCH 10/23] Moving TelemetryBase to common/Telemetry to be
 referenced for all Managed Telemtry hooks.

---
 src/{modules/previewpane => }/common/Telemetry/TelemetryBase.cs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{modules/previewpane => }/common/Telemetry/TelemetryBase.cs (100%)

diff --git a/src/modules/previewpane/common/Telemetry/TelemetryBase.cs b/src/common/Telemetry/TelemetryBase.cs
similarity index 100%
rename from src/modules/previewpane/common/Telemetry/TelemetryBase.cs
rename to src/common/Telemetry/TelemetryBase.cs

From 8b715ad9cdefef3823305011c62dea52779ec5bc Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Mon, 4 May 2020 19:25:43 -0700
Subject: [PATCH 11/23] Link including telemetry base, to preview pane.

---
 src/modules/previewpane/common/PreviewHandlerCommon.csproj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj
index 4ee5ce88e9..2c118c4181 100644
--- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj
+++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj
@@ -93,6 +93,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\common\Telemetry\TelemetryBase.cs">
+      <Link>Telemetry\TelemetryBase.cs</Link>
+    </Compile>
     <Compile Include="cominterop\IInitializeWithFile.cs" />
     <Compile Include="cominterop\COLORREF.cs" />
     <Compile Include="cominterop\IInitializeWithStream.cs" />
@@ -122,7 +125,6 @@
     <Compile Include="handlers\PreviewHandlerBase.cs" />
     <Compile Include="handlers\StreamBasedPreviewHandler.cs" />
     <Compile Include="examplehandler\TestCustomHandler.cs" />
-    <Compile Include="Telemetry\TelemetryBase.cs" />
     <Compile Include="Utilities\StreamWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -137,5 +139,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From 2b158c2b4e367d1e0c2db350409dbf7a46cb6fc4 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 08:36:33 -0700
Subject: [PATCH 12/23] Removing unused reader namespace from telemetrybase.

---
 src/common/Telemetry/TelemetryBase.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/Telemetry/TelemetryBase.cs b/src/common/Telemetry/TelemetryBase.cs
index 1440aec9d6..28eec72559 100644
--- a/src/common/Telemetry/TelemetryBase.cs
+++ b/src/common/Telemetry/TelemetryBase.cs
@@ -2,7 +2,6 @@
 // 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

From 3a24e4703d432d54c618c90eec8ee5d77a094698 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 08:53:07 -0700
Subject: [PATCH 13/23] Adding PowerLauncherTelemetry events

---
 PowerToys.sln                                 | 19 ++++++++
 .../Events/BootEvent.cs                       | 15 ++++++
 .../Events/FirstDeleteEvent.cs                | 13 +++++
 .../Events/HideEvent.cs                       | 13 +++++
 .../PowerLauncher.Telemetry/Events/IEvent.cs  | 11 +++++
 .../Events/QueryEvent.cs                      | 20 ++++++++
 .../Events/ResultActionEvent.cs               | 26 ++++++++++
 .../Events/ShowEvent.cs                       | 13 +++++
 .../PowerLauncher.Telemetry.csproj            | 11 +++++
 .../PowerLauncherTelemetry.cs                 | 48 +++++++++++++++++++
 10 files changed, 189 insertions(+)
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs

diff --git a/PowerToys.sln b/PowerToys.sln
index ad2e5ddc68..4153980331 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -244,6 +244,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "interop-tests", "src\common
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder\Microsoft.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher.Telemetry", "src\modules\launcher\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj", "{08C8C05F-0362-41BC-818C-724572DF8B06}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -868,6 +870,22 @@ Global
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|x64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|x64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x86.ActiveCfg = Release|x64
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x64.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x86.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM.Build.0 = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM64.Build.0 = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x64.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x64.Build.0 = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x86.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -935,6 +953,7 @@ Global
 		{985B3F2F-CEED-4C0A-A249-69257E719145} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{437AD818-3F1F-4CA5-A79B-25233A157026} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{08C8C05F-0362-41BC-818C-724572DF8B06} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
new file mode 100644
index 0000000000..44577a513c
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class BootEvent : IEvent
+    {
+        public string EventName { get; } = "PowerLauncher_Boot_Event";
+
+        public double BootTimeMs { get; set; }
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
new file mode 100644
index 0000000000..22ded2d8d9
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class FirstDeleteEvent : IEvent
+    {
+        public string EventName { get; } = "PowerLauncher_FirstDelete_Event";
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
new file mode 100644
index 0000000000..8e2fc99045
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class HideEvent : IEvent
+    {
+        public string EventName { get; } = "PowerLauncher_Hide_Event";
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs
new file mode 100644
index 0000000000..039f7b3592
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    public interface IEvent
+    {
+        string EventName { get; }
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
new file mode 100644
index 0000000000..0399fe14f3
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    /// <summary>
+    /// ETW Event for when the user initiates a query
+    /// </summary>
+    [EventData]
+    public class QueryEvent : IEvent
+    {
+        public string EventName { get; } = "PowerLauncher_Query_Event";
+        public double QueryTimeMs { get; set; }
+        public int QueryLength { get; set; }
+        public int NumResults { get; set; }
+    }
+
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
new file mode 100644
index 0000000000..3371d0d72d
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    /// <summary>
+    /// ETW event for when a result is actioned.
+    /// </summary>
+    [EventData]
+    public class ResultActionEvent : IEvent
+    {
+        public string EventName { get; } = "PowerLauncher_Result_ActionEvent";
+
+        public enum TriggerType
+        {
+            Click,
+            KeyboardShortcut
+        }
+
+        public TriggerType Trigger { get; set; }
+        public string PluginName { get; set; }
+        public string ActionName { get; set; }
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
new file mode 100644
index 0000000000..de27e42f5d
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class ShowEvent : IEvent
+    {
+        public string EventName { get; } = "PowerLauncher_Show_Event";
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
new file mode 100644
index 0000000000..79047e06d2
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\common\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs
new file mode 100644
index 0000000000..3848e51633
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs
@@ -0,0 +1,48 @@
+// 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 Microsoft.PowerLauncher.Telemetry
+{
+    /// <summary>
+    /// Telemetry helper class for Svg renderer.
+    /// </summary>
+    public class PowerLauncherTelemetry : TelemetryBase
+    {
+
+        /// <summary>
+        /// Name for ETW event.
+        /// </summary>
+        private const string EventSourceName = "Microsoft.PowerToys";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PowerLauncherTelemetry"/> class.
+        /// </summary>
+        public PowerLauncherTelemetry()
+            : base(EventSourceName)
+        {
+        }
+
+        /// <summary>
+        /// Gets an instance of the <see cref="PowerLauncherTelemetry"/> class.
+        /// </summary>
+        public static PowerLauncherTelemetry Log = new PowerLauncherTelemetry();
+
+        /// <summary>
+        /// Publishes ETW event when an action is triggered on 
+        /// </summary>
+        public void WriteEvent<T>(T telemetryEvent) 
+            where T : IEvent
+        {
+            this.Write<T>(telemetryEvent.EventName, new EventSourceOptions()
+            {
+                Keywords = ProjectKeywordMeasure,
+                Tags = ProjectTelemetryTagProductAndServicePerformance,
+            },
+            telemetryEvent);
+        }
+    }
+}

From 221e153f4c3689cc6263aa2251103b3c42abb2aa Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 08:55:29 -0700
Subject: [PATCH 14/23] Adding BootEvent for load time telemetry

---
 src/modules/launcher/PowerLauncher/App.xaml.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs
index 1e8e5c1d86..894af2fff5 100644
--- a/src/modules/launcher/PowerLauncher/App.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/App.xaml.cs
@@ -1,3 +1,4 @@
+using Microsoft.PowerLauncher.Telemetry;
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -50,6 +51,8 @@ namespace PowerLauncher
 
         private void OnStartup(object sender, StartupEventArgs e)
         {
+            var bootTime = new System.Diagnostics.Stopwatch();
+            bootTime.Start();
             Stopwatch.Normal("|App.OnStartup|Startup cost", () =>
             {
                 Log.Info("|App.OnStartup|Begin Wox startup ----------------------------------------------------");
@@ -93,12 +96,14 @@ namespace PowerLauncher
                 _mainVM.MainWindowVisibility = Visibility.Visible;
                 Log.Info("|App.OnStartup|End Wox startup ----------------------------------------------------  ");
 
-                
+                bootTime.Stop();
 
-        //[Conditional("RELEASE")]
-                    // check udpate every 5 hours
+                PowerLauncherTelemetry.Log.WriteEvent(new BootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
 
-                    // check updates on startup
+                //[Conditional("RELEASE")]
+                // check udpate every 5 hours
+
+                // check updates on startup
             });
         }
 

From 5cda4135b1b3adc52807adbbb90ab1eb7630e12e Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 08:57:01 -0700
Subject: [PATCH 15/23] Add telemetry event for when the user presses delete
 within the first 2 seconds of showing the launcher.

---
 .../launcher/PowerLauncher/MainWindow.xaml.cs | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
index 022082107c..89bb911eb7 100644
--- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
@@ -26,6 +26,8 @@ using Windows.UI.Xaml.Data;
 using System.Diagnostics;
 using Mages.Core.Runtime.Converters;
 using System.Runtime.InteropServices;
+using Microsoft.PowerLauncher.Telemetry;
+using System.Timers;
 
 namespace PowerLauncher
 {
@@ -41,6 +43,9 @@ namespace PowerLauncher
         const int ROW_HEIGHT = 75;
         const int MAX_LIST_HEIGHT = 300;
         bool isDPIChanged = false;
+        bool _deletePressed = false;
+        Timer _firstDeleteTimer = new Timer();
+
 
         #endregion
 
@@ -51,7 +56,21 @@ namespace PowerLauncher
             _settings = settings;
             InitializeComponent();
 
+            _firstDeleteTimer.Elapsed += CheckForFirstDelete;
+            _firstDeleteTimer.Interval = 1000;
+
         }
+
+        private void CheckForFirstDelete(object sender, ElapsedEventArgs e)
+        {
+            _firstDeleteTimer.Stop();
+            if (_deletePressed)
+            {
+                PowerLauncherTelemetry.Log.WriteEvent(new FirstDeleteEvent());
+            }
+
+        }
+
         public MainWindow()
         {
             InitializeComponent();
@@ -202,6 +221,8 @@ namespace PowerLauncher
                 {
                     if (Visibility == System.Windows.Visibility.Visible)
                     {
+                        _deletePressed = false;
+                        _firstDeleteTimer.Start();
                         Activate();
                         UpdatePosition();
                         _settings.ActivateTimes++;
@@ -216,6 +237,10 @@ namespace PowerLauncher
                             _launcher.QueryTextBox.SelectAll();
                         }
                     }
+                    else
+                    {
+                        _firstDeleteTimer.Stop();
+                    }
                 }
                 else if(e.PropertyName == nameof(MainViewModel.SystemQueryText))
                 {
@@ -307,6 +332,10 @@ namespace PowerLauncher
                 _viewModel.SelectPrevPageCommand.Execute(null);
                 e.Handled = true;
             }
+            else if( e.Key == VirtualKey.Back)
+            {
+                _deletePressed = true;
+            }
         }
 
         private void UpdateTextBoxToSelectedItem()

From e29e8ca0a3fe534dcb8ae642fd08f1b85567ed4c Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 09:02:06 -0700
Subject: [PATCH 16/23] Add launcher telemetry for show / hide, and query
 (elapsed time, num chars, num results).

---
 .../launcher/Wox/ViewModel/MainViewModel.cs   | 30 ++++++++++++++++++-
 src/modules/launcher/Wox/Wox.csproj           |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
index 0d9039bb9c..5483ddfb29 100644
--- a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
@@ -17,6 +17,7 @@ using Wox.Infrastructure.Hotkey;
 using Wox.Infrastructure.Storage;
 using Wox.Infrastructure.UserSettings;
 using Wox.Plugin;
+using Microsoft.PowerLauncher.Telemetry;
 using Wox.Storage;
 
 namespace Wox.ViewModel
@@ -303,7 +304,22 @@ namespace Wox.ViewModel
 
         public Visibility ProgressBarVisibility { get; set; }
 
-        public Visibility MainWindowVisibility { get; set; }
+        private Visibility _visibility = Visibility.Collapsed;
+        public Visibility MainWindowVisibility {
+            get { return _visibility; }
+            set {
+                _visibility = value;
+                if(value == Visibility.Visible)
+                {
+                    PowerLauncherTelemetry.Log.WriteEvent(new ShowEvent());
+                }
+                else
+                {
+                    PowerLauncherTelemetry.Log.WriteEvent(new HideEvent());
+                }
+            
+            }
+        }
 
         public ICommand EscCommand { get; set; }
         public ICommand SelectNextItemCommand { get; set; }
@@ -380,6 +396,8 @@ namespace Wox.ViewModel
         {
             if (!string.IsNullOrEmpty(QueryText))
             {
+                var queryTimer = new System.Diagnostics.Stopwatch();
+                queryTimer.Start();
                 _updateSource?.Cancel();
                 var currentUpdateSource = new CancellationTokenSource();
                 _updateSource = currentUpdateSource;
@@ -435,6 +453,16 @@ namespace Wox.ViewModel
                         { // update to hidden if this is still the current query
                             ProgressBarVisibility = Visibility.Hidden;
                         }
+
+                        queryTimer.Stop();
+                        var queryEvent = new QueryEvent()
+                        {
+                            QueryTimeMs = queryTimer.ElapsedMilliseconds,
+                            NumResults = Results.Results.Count,
+                            QueryLength = query.RawQuery.Length
+                        };
+                        PowerLauncherTelemetry.Log.WriteEvent(queryEvent);
+
                     }, currentCancellationToken);
                 }
             }
diff --git a/src/modules/launcher/Wox/Wox.csproj b/src/modules/launcher/Wox/Wox.csproj
index f3bca0db1b..9a78adbf0c 100644
--- a/src/modules/launcher/Wox/Wox.csproj
+++ b/src/modules/launcher/Wox/Wox.csproj
@@ -76,6 +76,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj" />
     <ProjectReference Include="..\Wox.Core\Wox.Core.csproj" />
     <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
     <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />

From a9cc4dabb72c3b15c18034315036e1a72be8a7f9 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 09:02:28 -0700
Subject: [PATCH 17/23] Adding launcher telemetry for context buttons clicked.

---
 .../ContextMenuLoader.cs                      |   5 +-
 .../ContextMenuLoader.cs                      |   3 +
 .../Microsoft.Plugin.Program/Programs/UWP.cs  |   2 +
 .../Programs/Win32.cs                         |   5 +-
 .../Plugins/Microsoft.Plugin.Shell/Main.cs    |   2 +
 .../PowerLauncher.UI/PowerLauncher.UI.csproj  | 240 +++++++++---------
 .../launcher/PowerLauncher.UI/ResultList.xaml |   3 +-
 .../PowerLauncher.UI/ResultList.xaml.cs       |  29 ++-
 .../launcher/Wox.Plugin/ContextMenuResult.cs  |   1 +
 .../Wox/ViewModel/ContextMenuItemViewModel.cs |  17 +-
 .../launcher/Wox/ViewModel/ResultViewModel.cs |   1 +
 11 files changed, 186 insertions(+), 122 deletions(-)

diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs
index d8fe84cc30..724ba96779 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs
@@ -8,7 +8,8 @@ using Wox.Infrastructure.Logger;
 using Wox.Infrastructure.Image;
 using Wox.Plugin.SharedCommands;
 using Wox.Plugin;
-
+using System.Reflection;
+
 namespace Microsoft.Plugin.Folder
 {
     internal class ContextMenuLoader : IContextMenu
@@ -34,6 +35,7 @@ namespace Microsoft.Plugin.Folder
                 var fileOrFolder = (record.Type == ResultType.File) ? "file" : "folder";
                 contextMenus.Add(new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = "Copy path",
                     Glyph = "\xE8C8",
                     FontFamily = "Segoe MDL2 Assets",
@@ -65,6 +67,7 @@ namespace Microsoft.Plugin.Folder
         {
             return new ContextMenuResult
             {
+                PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                 Title = "Open containing folder",
                 Glyph = "\xE838",
                 FontFamily = "Segoe MDL2 Assets",
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs
index 56424b5b21..310ff2bfdd 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs
@@ -6,6 +6,7 @@ using System.Windows;
 using Wox.Infrastructure.Logger;
 using Wox.Plugin;
 using Microsoft.Plugin.Indexer.SearchHelper;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Indexer
 {
@@ -39,6 +40,7 @@ namespace Microsoft.Plugin.Indexer
                 var fileOrFolder = (type == ResultType.File) ? "file" : "folder";
                 contextMenus.Add(new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = "Copy path",
                     Glyph = "\xE8C8",
                     FontFamily = "Segoe MDL2 Assets",
@@ -71,6 +73,7 @@ namespace Microsoft.Plugin.Indexer
         {
             return new ContextMenuResult
             {
+                PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                 Title = "Open containing folder",
                 Glyph = "\xE838",
                 FontFamily = "Segoe MDL2 Assets",
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs
index 95e12225d9..6576213704 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs
@@ -20,6 +20,7 @@ using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Media;
 using System.Windows.Controls;
 using Wox.Plugin;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Program.Programs
 {
@@ -314,6 +315,7 @@ namespace Microsoft.Plugin.Program.Programs
                 {
                     new ContextMenuResult
                     {
+                        PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                         Title = api.GetTranslation("wox_plugin_program_open_containing_folder"),
                         Glyph = "\xE838",
                         FontFamily = "Segoe MDL2 Assets",
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs
index c9ab274a97..1a746cb49d 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs
@@ -12,7 +12,8 @@ using Shell;
 using Wox.Infrastructure;
 using Microsoft.Plugin.Program.Logger;
 using Wox.Plugin;
-
+using System.Reflection;
+
 namespace Microsoft.Plugin.Program.Programs
 {
     [Serializable]
@@ -95,6 +96,7 @@ namespace Microsoft.Plugin.Program.Programs
             {
                 new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = api.GetTranslation("wox_plugin_program_run_as_administrator"),
                     Glyph = "\xE7EF",
                     FontFamily = "Segoe MDL2 Assets",
@@ -117,6 +119,7 @@ namespace Microsoft.Plugin.Program.Programs
                 },
                 new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = api.GetTranslation("wox_plugin_program_open_containing_folder"),
                     Glyph = "\xE838",
                     FontFamily = "Segoe MDL2 Assets",
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
index d794472f36..22a65d349a 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
@@ -18,6 +18,7 @@ using Wox.Plugin;
 using Application = System.Windows.Application;
 using Control = System.Windows.Controls.Control;
 using Keys = System.Windows.Forms.Keys;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Shell
 {
@@ -341,6 +342,7 @@ namespace Microsoft.Plugin.Shell
             {
                 new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = _context.API.GetTranslation("wox_plugin_cmd_run_as_administrator"),
                     Glyph = "\xE7EF",
                     FontFamily = "Segoe MDL2 Assets",
diff --git a/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj b/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj
index 298ae7cc07..2a008006d1 100644
--- a/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj
+++ b/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj
@@ -1,124 +1,130 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{4A3DE70C-684C-410D-B851-C23B6DAEDF16}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PowerLauncher.UI</RootNamespace>
-    <AssemblyName>PowerLauncher.UI</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="LauncherControl.xaml.cs">
-      <DependentUpon>LauncherControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResultList.xaml.cs">
-      <DependentUpon>ResultList.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="LauncherControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ResultList.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
-      <Version>6.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.4.0-prerelease.200322001</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{4A3DE70C-684C-410D-B851-C23B6DAEDF16}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PowerLauncher.UI</RootNamespace>
+    <AssemblyName>PowerLauncher.UI</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LauncherControl.xaml.cs">
+      <DependentUpon>LauncherControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ResultList.xaml.cs">
+      <DependentUpon>ResultList.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\Default.rd.xml" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="LauncherControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ResultList.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
+      <Version>6.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml">
+      <Version>2.4.0-prerelease.200322001</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj">
+      <Project>{08c8c05f-0362-41bc-818c-724572df8b06}</Project>
+      <Name>PowerLauncher.Telemetry</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <PropertyGroup>
-    <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
-    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
-  </PropertyGroup>
+  -->
+  <PropertyGroup>
+    <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
+    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
index df505cd174..cff616a3a6 100644
--- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
+++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
@@ -99,7 +99,7 @@
                                    SelectedIndex="{Binding ContextMenuSelectedIndex}">
                             <GridView.ItemTemplate>
                                 <DataTemplate>
-                                    <Button Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource IconOnlyButton}">
+                                    <Button   Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource IconOnlyButton}" Click="ContextButton_OnClick">
                                         <ToolTipService.ToolTip>
                                             <TextBlock Text="{Binding Title}"/>
                                         </ToolTipService.ToolTip>
@@ -111,6 +111,7 @@
                                                 Key="{Binding AcceleratorKey}"
                                                 Modifiers="{Binding AcceleratorModifiers}"
                                                 IsEnabled="{Binding IsAcceleratorKeyEnabled}"
+                                                Invoked="ContextButton_OnAcceleratorInvoked"
                                             />
                                         </Button.KeyboardAccelerators>
                                     </Button>
diff --git a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
index 72a87caa4c..507378a719 100644
--- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
+++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.PowerLauncher.Telemetry;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -10,9 +11,35 @@ namespace PowerLauncher.UI
 {
     public sealed partial class ResultList : UserControl
     {
+        private ResultActionEvent.TriggerType triggerType = ResultActionEvent.TriggerType.Click;
         public ResultList()
         {
             InitializeComponent();
         }
+
+
+        private void ContextButton_OnAcceleratorInvoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
+        {
+            this.triggerType = ResultActionEvent.TriggerType.KeyboardShortcut;
+        }
+
+        private void ContextButton_OnClick(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            var button = sender as Windows.UI.Xaml.Controls.Button;
+
+            if (button != null)
+            {
+                //We currently can't take a reference on the wox project from a UWP project.  The dynamic method invoke should be replace
+                //by an call to the view model once we refactor the project.
+                var dataContext = ((dynamic)button.DataContext);
+                if(dataContext?.GetType().GetMethod("SendTelemetryEvent") != null)
+                {
+                    dataContext.SendTelemetryEvent(triggerType);
+                }
+            }
+
+            //Restore the trigger type back to click
+            triggerType = ResultActionEvent.TriggerType.Click;
+        }
     }
 }
diff --git a/src/modules/launcher/Wox.Plugin/ContextMenuResult.cs b/src/modules/launcher/Wox.Plugin/ContextMenuResult.cs
index f6d2e97c9c..d6e3238957 100644
--- a/src/modules/launcher/Wox.Plugin/ContextMenuResult.cs
+++ b/src/modules/launcher/Wox.Plugin/ContextMenuResult.cs
@@ -8,6 +8,7 @@ namespace Wox.Plugin
 
     public class ContextMenuResult
     {
+        public string PluginName { get; set; }
         public string Title { get; set; }
         public string SubTitle { get; set; }
 
diff --git a/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs b/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
index d21f372204..d2509e5159 100644
--- a/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
@@ -1,4 +1,6 @@
-using System.Drawing;
+using Microsoft.PowerLauncher.Telemetry;
+using System.Drawing;
+using System.Windows.Forms;
 using System.Windows.Input;
 using Wox.Plugin;
 
@@ -6,6 +8,7 @@ namespace Wox.ViewModel
 {
     public class ContextMenuItemViewModel : BaseModel
     {
+        public string PluginName { get; set; }
         public string Title { get; set; }
         public string Glyph { get; set; }
         public string FontFamily { get; set; }
@@ -13,5 +16,17 @@ namespace Wox.ViewModel
         public string AcceleratorKey { get; set; }
         public string AcceleratorModifiers { get; set; }
         public bool IsAcceleratorKeyEnabled { get; set; }
+
+        public void SendTelemetryEvent(ResultActionEvent.TriggerType triggerType)
+        {
+            var eventData = new ResultActionEvent()
+            {
+                PluginName = PluginName,
+                Trigger = triggerType,
+                ActionName = Title
+
+            };
+            PowerLauncherTelemetry.Log.WriteEvent(eventData);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs
index 9127850371..24b7c728ae 100644
--- a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs
@@ -119,6 +119,7 @@ namespace Wox.ViewModel
             {
                 newItems.Add(new ContextMenuItemViewModel
                 {
+                    PluginName = r.PluginName,
                     Title = r.Title,
                     Glyph = r.Glyph,
                     FontFamily = r.FontFamily,

From def0d7a519dc5d7a15d99b4a155dc25e7d67f0bd Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 09:23:31 -0700
Subject: [PATCH 18/23] Small refactor to use common powertoys telemetry event
 source accross modules.

---
 PowerToys.sln                                 | 19 +++++++++++++++++++
 .../Telemetry}/Events/IEvent.cs               |  2 +-
 .../Telemetry/PowerToysTelemetry.cs}          | 12 ++++++------
 .../Telemetry/Telemetry.csproj                | 11 +++++++++++
 .../Events/BootEvent.cs                       |  1 +
 .../Events/FirstDeleteEvent.cs                |  1 +
 .../Events/HideEvent.cs                       |  1 +
 .../Events/QueryEvent.cs                      |  1 +
 .../Events/ResultActionEvent.cs               |  1 +
 .../Events/ShowEvent.cs                       |  1 +
 .../PowerLauncher.Telemetry.csproj            |  2 +-
 .../launcher/PowerLauncher/App.xaml.cs        |  3 ++-
 .../launcher/PowerLauncher/MainWindow.xaml.cs |  3 ++-
 .../Wox/ViewModel/ContextMenuItemViewModel.cs |  3 ++-
 .../launcher/Wox/ViewModel/MainViewModel.cs   |  9 +++++----
 15 files changed, 55 insertions(+), 15 deletions(-)
 rename src/{modules/launcher/PowerLauncher.Telemetry => common/ManagedTelemetry/Telemetry}/Events/IEvent.cs (73%)
 rename src/{modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs => common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs} (73%)
 create mode 100644 src/common/ManagedTelemetry/Telemetry/Telemetry.csproj

diff --git a/PowerToys.sln b/PowerToys.sln
index 4153980331..7c6d765194 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -246,6 +246,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher.Telemetry", "src\modules\launcher\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj", "{08C8C05F-0362-41BC-818C-724572DF8B06}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telemetry", "src\common\ManagedTelemetry\Telemetry\Telemetry.csproj", "{5D00D290-4016-4CFE-9E41-1E7C724509BA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -886,6 +888,22 @@ Global
 		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x64.Build.0 = Release|Any CPU
 		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x86.ActiveCfg = Release|Any CPU
 		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x86.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM64.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x64.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -954,6 +972,7 @@ Global
 		{437AD818-3F1F-4CA5-A79B-25233A157026} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{08C8C05F-0362-41BC-818C-724572DF8B06} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs b/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
similarity index 73%
rename from src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs
rename to src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
index 039f7b3592..0bdfb42099 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/IEvent.cs
+++ b/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Microsoft.PowerLauncher.Telemetry
+namespace Microsoft.PowerToys.Telemetry
 {
     public interface IEvent
     {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
similarity index 73%
rename from src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs
rename to src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
index 3848e51633..5d3edfb2ad 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncherTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -5,12 +5,12 @@
 using System.Diagnostics.Tracing;
 using PreviewHandlerCommon.Telemetry;
 
-namespace Microsoft.PowerLauncher.Telemetry
+namespace Microsoft.PowerToys.Telemetry
 {
     /// <summary>
-    /// Telemetry helper class for Svg renderer.
+    /// Telemetry helper class for PowerToys.
     /// </summary>
-    public class PowerLauncherTelemetry : TelemetryBase
+    public class PowerToysTelemetry : TelemetryBase
     {
 
         /// <summary>
@@ -19,9 +19,9 @@ namespace Microsoft.PowerLauncher.Telemetry
         private const string EventSourceName = "Microsoft.PowerToys";
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PowerLauncherTelemetry"/> class.
+        /// Initializes a new instance of the <see cref="PowerToysTelemetry"/> class.
         /// </summary>
-        public PowerLauncherTelemetry()
+        public PowerToysTelemetry()
             : base(EventSourceName)
         {
         }
@@ -29,7 +29,7 @@ namespace Microsoft.PowerLauncher.Telemetry
         /// <summary>
         /// Gets an instance of the <see cref="PowerLauncherTelemetry"/> class.
         /// </summary>
-        public static PowerLauncherTelemetry Log = new PowerLauncherTelemetry();
+        public static PowerToysTelemetry Log = new PowerToysTelemetry();
 
         /// <summary>
         /// Publishes ETW event when an action is triggered on 
diff --git a/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj b/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj
new file mode 100644
index 0000000000..cca827fbf6
--- /dev/null
+++ b/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
index 44577a513c..4351090652 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Text;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
index 22ded2d8d9..5585010717 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Text;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
index 8e2fc99045..3aab162662 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Text;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
index 0399fe14f3..ea986eccc6 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Text;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
index 3371d0d72d..a338ba26a9 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Text;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
index de27e42f5d..ec5afe34c4 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Text;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
index 79047e06d2..d70903b0cb 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
+++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\common\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
+    <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\Telemetry.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs
index 894af2fff5..d4b08fd256 100644
--- a/src/modules/launcher/PowerLauncher/App.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/App.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.PowerLauncher.Telemetry;
+using Microsoft.PowerToys.Telemetry;
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -98,7 +99,7 @@ namespace PowerLauncher
 
                 bootTime.Stop();
 
-                PowerLauncherTelemetry.Log.WriteEvent(new BootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
+                PowerToysTelemetry.Log.WriteEvent(new BootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
 
                 //[Conditional("RELEASE")]
                 // check udpate every 5 hours
diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
index 89bb911eb7..1086b7620a 100644
--- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
@@ -28,6 +28,7 @@ using Mages.Core.Runtime.Converters;
 using System.Runtime.InteropServices;
 using Microsoft.PowerLauncher.Telemetry;
 using System.Timers;
+using Microsoft.PowerToys.Telemetry;
 
 namespace PowerLauncher
 {
@@ -66,7 +67,7 @@ namespace PowerLauncher
             _firstDeleteTimer.Stop();
             if (_deletePressed)
             {
-                PowerLauncherTelemetry.Log.WriteEvent(new FirstDeleteEvent());
+                PowerToysTelemetry.Log.WriteEvent(new FirstDeleteEvent());
             }
 
         }
diff --git a/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs b/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
index d2509e5159..d09fa5d3c7 100644
--- a/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
@@ -1,4 +1,5 @@
 using Microsoft.PowerLauncher.Telemetry;
+using Microsoft.PowerToys.Telemetry;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Input;
@@ -26,7 +27,7 @@ namespace Wox.ViewModel
                 ActionName = Title
 
             };
-            PowerLauncherTelemetry.Log.WriteEvent(eventData);
+            PowerToysTelemetry.Log.WriteEvent(eventData);
         }
     }
 }
\ No newline at end of file
diff --git a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
index 5483ddfb29..5005fc5fe2 100644
--- a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
@@ -19,7 +19,8 @@ using Wox.Infrastructure.UserSettings;
 using Wox.Plugin;
 using Microsoft.PowerLauncher.Telemetry;
 using Wox.Storage;
-
+using Microsoft.PowerToys.Telemetry;
+
 namespace Wox.ViewModel
 {
     public class MainViewModel : BaseModel, ISavable
@@ -311,11 +312,11 @@ namespace Wox.ViewModel
                 _visibility = value;
                 if(value == Visibility.Visible)
                 {
-                    PowerLauncherTelemetry.Log.WriteEvent(new ShowEvent());
+                    PowerToysTelemetry.Log.WriteEvent(new ShowEvent());
                 }
                 else
                 {
-                    PowerLauncherTelemetry.Log.WriteEvent(new HideEvent());
+                    PowerToysTelemetry.Log.WriteEvent(new HideEvent());
                 }
             
             }
@@ -461,7 +462,7 @@ namespace Wox.ViewModel
                             NumResults = Results.Results.Count,
                             QueryLength = query.RawQuery.Length
                         };
-                        PowerLauncherTelemetry.Log.WriteEvent(queryEvent);
+                        PowerToysTelemetry.Log.WriteEvent(queryEvent);
 
                     }, currentCancellationToken);
                 }

From b4d75e3240485864188915c63359cbe0208c66b6 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 11:44:54 -0700
Subject: [PATCH 19/23] Adding telemetry events for Settings Enabled or
 Disabled Modules

---
 .../EnabledModules.cs                         | 169 ++++++++++++++----
 ...Microsoft.PowerToys.Settings.UI.Lib.csproj |   1 +
 .../Telemetry/Events/EnabledModuleEvent.cs    |  15 ++
 .../MainWindow.xaml.cs                        |   3 +-
 4 files changed, 151 insertions(+), 37 deletions(-)
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs

diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
index 50e271df78..d93717eb56 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
@@ -1,47 +1,144 @@
-// 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.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Microsoft.PowerToys.Settings.UI.Lib
-{
-    public class EnabledModules
-    {
-        public EnabledModules()
-        {
-            this.FancyZones = false;
-            this.ImageResizer = false;
-            this.FileExplorerPreview = false;
-            this.PowerRename = false;
-            this.ShortcutGuide = false;
-            this.PowerLauncher = true;
-        }
+// 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.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.PowerToys.Settings.Telemetry;
+using Microsoft.PowerToys.Telemetry;
+
+namespace Microsoft.PowerToys.Settings.UI.Lib
+{
+    public class EnabledModules
+    {
+        public EnabledModules()
+        {
+        }
+
+        private bool fancyZones = true;
 
         [JsonPropertyName("FancyZones")]
-        public bool FancyZones { get; set; }
+        public bool FancyZones
+        {
+            get => this.fancyZones;
+            set
+            {
+                if (this.fancyZones != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.fancyZones = value;
+                }
+            }
+        }
+
+        private bool imageResizer = true;
 
         [JsonPropertyName("Image Resizer")]
-        public bool ImageResizer { get; set; }
+        public bool ImageResizer
+        {
+            get => this.imageResizer;
+            set
+            {
+                if (this.imageResizer != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.imageResizer = value;
+                }
+            }
+        }
+
+        private bool fileExplorerPreview = true;
 
         [JsonPropertyName("File Explorer Preview")]
-        public bool FileExplorerPreview { get; set; }
+        public bool FileExplorerPreview
+        {
+            get => this.fileExplorerPreview;
+            set
+            {
+                if (this.fileExplorerPreview != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.fileExplorerPreview = value;
+                }
+            }
+        }
+
+        private bool shortcutGuide = true;
 
         [JsonPropertyName("Shortcut Guide")]
-        public bool ShortcutGuide { get; set; }
-
-        public bool PowerRename { get; set; }
-
-        [JsonPropertyName("Keyboard Manager")]
-        public bool KeyboardManager { get; set; }
-
-        [JsonPropertyName("Run")]
-        public bool PowerLauncher { get; set; }
-
-        public string ToJsonString()
+        public bool ShortcutGuide
         {
-            return JsonSerializer.Serialize(this);
+            get => this.shortcutGuide;
+            set
+            {
+                if (this.shortcutGuide != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.shortcutGuide = value;
+                }
+            }
         }
-    }
+
+        private bool powerRename = true;
+
+        public bool PowerRename
+        {
+            get => this.powerRename;
+            set
+            {
+                if (this.powerRename != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.powerRename = value;
+                }
+            }
+        }
+
+        private bool keyboardManager = true;
+        [JsonPropertyName("Keyboard Manager")]
+        public bool KeyboardManager
+        {
+            get => this.keyboardManager;
+            set
+            {
+                if (this.keyboardManager != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.keyboardManager = value;
+                }
+            }
+        }
+
+        private bool powerLauncher = true;
+
+     	[JsonPropertyName("Run")]
+        public bool PowerLauncher
+        {
+            get => this.powerLauncher;
+            set
+            {
+                if (this.powerLauncher != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.powerLauncher = value;
+                }
+            }
+}
+
+        public string ToJsonString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
+
+        private void LogTelemetryEvent(bool value, [CallerMemberName] string moduleName = null )
+        {
+            var dataEvent = new EnabledModuleEvent()
+            {
+                Value = value,
+                ModuleName = moduleName,
+            };
+            PowerToysTelemetry.Log.WriteEvent(dataEvent);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
index db1d040113..b8d8e05ec2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\common\interop\interop.vcxproj" />
+    <ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\Telemetry.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs
new file mode 100644
index 0000000000..658c41adef
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs
@@ -0,0 +1,15 @@
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+
+namespace Microsoft.PowerToys.Settings.Telemetry
+{
+    [EventData]
+    public class EnabledModuleEvent : IEvent
+    {
+        public string EventName { get; } = "Settings_EnableModule";
+
+        public string ModuleName { get; set; }
+
+        public bool Value { get; set; }
+    }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
index 3eb5d43604..e6fc42b0d0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
@@ -29,7 +29,8 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
                 // send IPC Message
                 shellPage.SetDefaultSndMessageCallback(msg =>
                 {
-                    Program.GetTwoWayIPCManager().Send(msg);
+                    //IPC Manager is null when launching runner directly
+                    Program.GetTwoWayIPCManager()?.Send(msg);
                 });
 
                 // send IPC Message

From 1f9c1ce8e4b9e6a8583c023460e5afca4d98f7a7 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 12:17:26 -0700
Subject: [PATCH 20/23] Removing unecceary EventName requirement. 
 EventSource<T>.Write will use the type name of T if null is passed in.  This
 saves us passing an extra string uneccesarily as the public property would be
 serialized into the event data as well as being specified as the EventName

---
 .../ManagedTelemetry/Telemetry/Events/IEvent.cs  | 11 -----------
 .../Telemetry/PowerToysTelemetry.cs              |  3 +--
 .../EnabledModules.cs                            |  2 +-
 ...uleEvent.cs => SettingsEnabledModuleEvent.cs} |  3 +--
 .../PowerLauncher.Telemetry/Events/BootEvent.cs  | 16 ----------------
 .../Events/FirstDeleteEvent.cs                   | 14 --------------
 .../PowerLauncher.Telemetry/Events/HideEvent.cs  | 14 --------------
 .../Events/LauncherBootEvent.cs                  | 10 ++++++++++
 .../Events/LauncherFirstDeleteEvent.cs           |  9 +++++++++
 .../Events/LauncherHideEvent.cs                  |  9 +++++++++
 .../{QueryEvent.cs => LauncherQueryEvent.cs}     |  9 ++-------
 ...tionEvent.cs => LauncherResultActionEvent.cs} | 11 +++--------
 .../Events/LauncherShowEvent.cs                  |  9 +++++++++
 .../PowerLauncher.Telemetry/Events/ShowEvent.cs  | 14 --------------
 .../launcher/PowerLauncher.UI/ResultList.xaml.cs |  6 +++---
 src/modules/launcher/PowerLauncher/App.xaml.cs   |  2 +-
 .../launcher/PowerLauncher/MainWindow.xaml.cs    |  2 +-
 .../Wox/ViewModel/ContextMenuItemViewModel.cs    |  6 +++---
 .../launcher/Wox/ViewModel/MainViewModel.cs      |  6 +++---
 19 files changed, 56 insertions(+), 100 deletions(-)
 delete mode 100644 src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
 rename src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/{EnabledModuleEvent.cs => SettingsEnabledModuleEvent.cs} (73%)
 delete mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
 delete mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
 delete mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherBootEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherFirstDeleteEvent.cs
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherHideEvent.cs
 rename src/modules/launcher/PowerLauncher.Telemetry/Events/{QueryEvent.cs => LauncherQueryEvent.cs} (53%)
 rename src/modules/launcher/PowerLauncher.Telemetry/Events/{ResultActionEvent.cs => LauncherResultActionEvent.cs} (51%)
 create mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherShowEvent.cs
 delete mode 100644 src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs

diff --git a/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs b/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
deleted file mode 100644
index 0bdfb42099..0000000000
--- a/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.PowerToys.Telemetry
-{
-    public interface IEvent
-    {
-        string EventName { get; }
-    }
-}
diff --git a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
index 5d3edfb2ad..9159e837e4 100644
--- a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -35,9 +35,8 @@ namespace Microsoft.PowerToys.Telemetry
         /// Publishes ETW event when an action is triggered on 
         /// </summary>
         public void WriteEvent<T>(T telemetryEvent) 
-            where T : IEvent
         {
-            this.Write<T>(telemetryEvent.EventName, new EventSourceOptions()
+            this.Write<T>(null, new EventSourceOptions()
             {
                 Keywords = ProjectKeywordMeasure,
                 Tags = ProjectTelemetryTagProductAndServicePerformance,
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
index d93717eb56..e256e69286 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
@@ -133,7 +133,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
 
         private void LogTelemetryEvent(bool value, [CallerMemberName] string moduleName = null )
         {
-            var dataEvent = new EnabledModuleEvent()
+            var dataEvent = new SettingsEnabledModuleEvent()
             {
                 Value = value,
                 ModuleName = moduleName,
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs
similarity index 73%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs
index 658c41adef..754a640f5f 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/EnabledModuleEvent.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs
@@ -1,10 +1,9 @@
 using System.Diagnostics.Tracing;
-using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerToys.Settings.Telemetry
 {
     [EventData]
-    public class EnabledModuleEvent : IEvent
+    public class SettingsEnabledModuleEvent
     {
         public string EventName { get; } = "Settings_EnableModule";
 
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
deleted file mode 100644
index 4351090652..0000000000
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/BootEvent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-using Microsoft.PowerToys.Telemetry;
-
-namespace Microsoft.PowerLauncher.Telemetry
-{
-    [EventData]
-    public class BootEvent : IEvent
-    {
-        public string EventName { get; } = "PowerLauncher_Boot_Event";
-
-        public double BootTimeMs { get; set; }
-    }
-}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
deleted file mode 100644
index 5585010717..0000000000
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/FirstDeleteEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-using Microsoft.PowerToys.Telemetry;
-
-namespace Microsoft.PowerLauncher.Telemetry
-{
-    [EventData]
-    public class FirstDeleteEvent : IEvent
-    {
-        public string EventName { get; } = "PowerLauncher_FirstDelete_Event";
-    }
-}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
deleted file mode 100644
index 3aab162662..0000000000
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/HideEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-using Microsoft.PowerToys.Telemetry;
-
-namespace Microsoft.PowerLauncher.Telemetry
-{
-    [EventData]
-    public class HideEvent : IEvent
-    {
-        public string EventName { get; } = "PowerLauncher_Hide_Event";
-    }
-}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherBootEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherBootEvent.cs
new file mode 100644
index 0000000000..5e245c655e
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherBootEvent.cs
@@ -0,0 +1,10 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherBootEvent 
+    {
+        public double BootTimeMs { get; set; }
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherFirstDeleteEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherFirstDeleteEvent.cs
new file mode 100644
index 0000000000..3c4ff30af2
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherFirstDeleteEvent.cs
@@ -0,0 +1,9 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherFirstDeleteEvent
+    {
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherHideEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherHideEvent.cs
new file mode 100644
index 0000000000..7ce8c92ccd
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherHideEvent.cs
@@ -0,0 +1,9 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherHideEvent
+    {
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherQueryEvent.cs
similarity index 53%
rename from src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
rename to src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherQueryEvent.cs
index ea986eccc6..8e1cc73c5c 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/QueryEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherQueryEvent.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-using Microsoft.PowerToys.Telemetry;
+using System.Diagnostics.Tracing;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
@@ -10,9 +6,8 @@ namespace Microsoft.PowerLauncher.Telemetry
     /// ETW Event for when the user initiates a query
     /// </summary>
     [EventData]
-    public class QueryEvent : IEvent
+    public class LauncherQueryEvent
     {
-        public string EventName { get; } = "PowerLauncher_Query_Event";
         public double QueryTimeMs { get; set; }
         public int QueryLength { get; set; }
         public int NumResults { get; set; }
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherResultActionEvent.cs
similarity index 51%
rename from src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
rename to src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherResultActionEvent.cs
index a338ba26a9..be28d20906 100644
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/ResultActionEvent.cs
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherResultActionEvent.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-using Microsoft.PowerToys.Telemetry;
+using System.Diagnostics.Tracing;
 
 namespace Microsoft.PowerLauncher.Telemetry
 {
@@ -10,9 +6,8 @@ namespace Microsoft.PowerLauncher.Telemetry
     /// ETW event for when a result is actioned.
     /// </summary>
     [EventData]
-    public class ResultActionEvent : IEvent
+    public class LauncherResultActionEvent 
     {
-        public string EventName { get; } = "PowerLauncher_Result_ActionEvent";
 
         public enum TriggerType
         {
@@ -20,7 +15,7 @@ namespace Microsoft.PowerLauncher.Telemetry
             KeyboardShortcut
         }
 
-        public TriggerType Trigger { get; set; }
+        public string Trigger { get; set; }
         public string PluginName { get; set; }
         public string ActionName { get; set; }
     }
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherShowEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherShowEvent.cs
new file mode 100644
index 0000000000..d785bef5c8
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherShowEvent.cs
@@ -0,0 +1,9 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherShowEvent 
+    {
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs b/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
deleted file mode 100644
index ec5afe34c4..0000000000
--- a/src/modules/launcher/PowerLauncher.Telemetry/Events/ShowEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-using Microsoft.PowerToys.Telemetry;
-
-namespace Microsoft.PowerLauncher.Telemetry
-{
-    [EventData]
-    public class ShowEvent : IEvent
-    {
-        public string EventName { get; } = "PowerLauncher_Show_Event";
-    }
-}
diff --git a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
index 507378a719..5f0af0b5be 100644
--- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
+++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
@@ -11,7 +11,7 @@ namespace PowerLauncher.UI
 {
     public sealed partial class ResultList : UserControl
     {
-        private ResultActionEvent.TriggerType triggerType = ResultActionEvent.TriggerType.Click;
+        private LauncherResultActionEvent.TriggerType triggerType = LauncherResultActionEvent.TriggerType.Click;
         public ResultList()
         {
             InitializeComponent();
@@ -20,7 +20,7 @@ namespace PowerLauncher.UI
 
         private void ContextButton_OnAcceleratorInvoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
         {
-            this.triggerType = ResultActionEvent.TriggerType.KeyboardShortcut;
+            this.triggerType = LauncherResultActionEvent.TriggerType.KeyboardShortcut;
         }
 
         private void ContextButton_OnClick(object sender, Windows.UI.Xaml.RoutedEventArgs e)
@@ -39,7 +39,7 @@ namespace PowerLauncher.UI
             }
 
             //Restore the trigger type back to click
-            triggerType = ResultActionEvent.TriggerType.Click;
+            triggerType = LauncherResultActionEvent.TriggerType.Click;
         }
     }
 }
diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs
index d4b08fd256..f996f62995 100644
--- a/src/modules/launcher/PowerLauncher/App.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/App.xaml.cs
@@ -99,7 +99,7 @@ namespace PowerLauncher
 
                 bootTime.Stop();
 
-                PowerToysTelemetry.Log.WriteEvent(new BootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
+                PowerToysTelemetry.Log.WriteEvent(new LauncherBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
 
                 //[Conditional("RELEASE")]
                 // check udpate every 5 hours
diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
index 1086b7620a..8974a35572 100644
--- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
@@ -67,7 +67,7 @@ namespace PowerLauncher
             _firstDeleteTimer.Stop();
             if (_deletePressed)
             {
-                PowerToysTelemetry.Log.WriteEvent(new FirstDeleteEvent());
+                PowerToysTelemetry.Log.WriteEvent(new LauncherFirstDeleteEvent());
             }
 
         }
diff --git a/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs b/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
index d09fa5d3c7..becb85f7c3 100644
--- a/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs
@@ -18,12 +18,12 @@ namespace Wox.ViewModel
         public string AcceleratorModifiers { get; set; }
         public bool IsAcceleratorKeyEnabled { get; set; }
 
-        public void SendTelemetryEvent(ResultActionEvent.TriggerType triggerType)
+        public void SendTelemetryEvent(LauncherResultActionEvent.TriggerType triggerType)
         {
-            var eventData = new ResultActionEvent()
+            var eventData = new LauncherResultActionEvent()
             {
                 PluginName = PluginName,
-                Trigger = triggerType,
+                Trigger = triggerType.ToString(),
                 ActionName = Title
 
             };
diff --git a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
index 5005fc5fe2..adc0f41f4a 100644
--- a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
+++ b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
@@ -312,11 +312,11 @@ namespace Wox.ViewModel
                 _visibility = value;
                 if(value == Visibility.Visible)
                 {
-                    PowerToysTelemetry.Log.WriteEvent(new ShowEvent());
+                    PowerToysTelemetry.Log.WriteEvent(new LauncherShowEvent());
                 }
                 else
                 {
-                    PowerToysTelemetry.Log.WriteEvent(new HideEvent());
+                    PowerToysTelemetry.Log.WriteEvent(new LauncherHideEvent());
                 }
             
             }
@@ -456,7 +456,7 @@ namespace Wox.ViewModel
                         }
 
                         queryTimer.Stop();
-                        var queryEvent = new QueryEvent()
+                        var queryEvent = new LauncherQueryEvent()
                         {
                             QueryTimeMs = queryTimer.ElapsedMilliseconds,
                             NumResults = Results.Results.Count,

From 88dfd90e3b3d732307ba09ed76dfc7b751882293 Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Tue, 5 May 2020 13:21:47 -0700
Subject: [PATCH 21/23] Removing unecessary event name from
 SettingsEnabledModuleEvent

---
 .../Telemetry/Events/SettingsEnabledModuleEvent.cs              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs
index 754a640f5f..d96e7fc75a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs
@@ -5,8 +5,6 @@ namespace Microsoft.PowerToys.Settings.Telemetry
     [EventData]
     public class SettingsEnabledModuleEvent
     {
-        public string EventName { get; } = "Settings_EnableModule";
-
         public string ModuleName { get; set; }
 
         public bool Value { get; set; }

From 72fe972cc00e831c6dc02ba00de1c2e25993826a Mon Sep 17 00:00:00 2001
From: ryanbodrug-microsoft
 <56318517+ryanbodrug-microsoft@users.noreply.github.com>
Date: Wed, 6 May 2020 14:55:25 -0700
Subject: [PATCH 22/23] fixing nit: comments

---
 src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
index 5f0af0b5be..c5b95acbca 100644
--- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
+++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs
@@ -29,8 +29,8 @@ namespace PowerLauncher.UI
 
             if (button != null)
             {
-                //We currently can't take a reference on the wox project from a UWP project.  The dynamic method invoke should be replace
-                //by an call to the view model once we refactor the project.
+                //We currently can't take a reference on the wox project from a UWP project.  The dynamic method invocation should be replaced
+                //by a call to the view model once we refactor the project.
                 var dataContext = ((dynamic)button.DataContext);
                 if(dataContext?.GetType().GetMethod("SendTelemetryEvent") != null)
                 {

From 9a323e33879ae34d8921bed9d9268856e0309f06 Mon Sep 17 00:00:00 2001
From: Tomas Agustin Raies <tomas.raies@gmail.com>
Date: Wed, 6 May 2020 15:55:53 -0700
Subject: [PATCH 23/23] [Launcher] Remove ASP .NET dependencies (#2697)

* Remove ASP .NET dependencies

* Replaced NLog.Web.AspNetCore with NLog.Extensions.Logging

* Remove NLog.Web.AspNetCore.dll from installer

* Add missing dlls
---
 installer/PowerToysSetup/Product.wxs                            | 2 +-
 src/modules/launcher/PowerLauncher/PowerLauncher.csproj         | 1 -
 .../launcher/Wox.Infrastructure/Wox.Infrastructure.csproj       | 2 +-
 src/modules/launcher/Wox/Wox.csproj                             | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 70ced77bfa..f24842bc1f 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -720,7 +720,7 @@
   <Fragment>
     <ComponentGroup Id="LauncherComponents">
       <Component Id="launcherInstallComponent" Directory="LauncherInstallFolder" Guid="5E688DB4-C522-4268-BA54-ED1CDFFE9DB6">
-        <?foreach File in App.xbf;clrcompression.dll;ColorCode.Core.dll;ColorCode.UWP.dll;ColorCode.UWP.pri;concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;LauncherControl.xbf;Mages.Core.dll;Microsoft.CSharp.dll;Microsoft.Graphics.Canvas.dll;Microsoft.Graphics.Canvas.winmd;Microsoft.Search.Interop.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Parsers.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.pri;Microsoft.Toolkit.Uwp.UI.Animations.dll;Microsoft.Toolkit.Uwp.UI.Animations.pri;Microsoft.Toolkit.Uwp.UI.Controls.dll;Microsoft.Toolkit.Uwp.UI.Controls.pri;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Uwp.UI.pri;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Win32.UI.XamlHost.pri;Microsoft.Toolkit.Win32.UI.XamlHost.winmd;Microsoft.Toolkit.Win32.UI.XamlHost.xml;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.UI.Xaml.pri;Microsoft.UI.Xaml.winmd;Microsoft.VisualBasic.dll;Microsoft.Win32.Primitives.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactions.pri;Microsoft.Xaml.Interactivity.dll;Microsoft.Xaml.Interactivity.pri;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;mscorlib.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;netstandard.dll;Newtonsoft.Json.dll;NHotkey.dll;NHotkey.Wpf.dll;NLog.dll;NLog.Extensions.Logging.dll;NLog.Web.AspNetCore.dll;NoiseAsset_256x256_PNG.png;Pinyin4Net.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;PowerLauncher.runtimeconfig.dev.json;PowerLauncher.runtimeconfig.json;PowerLauncher.UI.exe;PowerLauncher.UI.xr.xml;PropertyChanged.dll;resources.pri;ResultList.xbf;SQLite.Interop.dll;System.AppContext.dll;System.Buffers.dll;System.Collections.Concurrent.dll;System.Collections.dll;System.Collections.Immutable.dll;System.Collections.NonGeneric.dll;System.Collections.Specialized.dll;System.ComponentModel.Annotations.dll;System.ComponentModel.Composition.dll;System.ComponentModel.DataAnnotations.dll;System.ComponentModel.dll;System.ComponentModel.EventBasedAsync.dll;System.ComponentModel.Primitives.dll;System.ComponentModel.TypeConverter.dll;System.Configuration.dll;System.Console.dll;System.Core.dll;System.Data.Common.dll;System.Data.dll;System.Data.OleDb.dll;System.Data.SqlClient.dll;System.Data.SQLite.dll;System.Diagnostics.Contracts.dll;System.Diagnostics.Debug.dll;System.Diagnostics.DiagnosticSource.dll;System.Diagnostics.FileVersionInfo.dll;System.Diagnostics.Process.dll;System.Diagnostics.StackTrace.dll;System.Diagnostics.TextWriterTraceListener.dll;System.Diagnostics.Tools.dll;System.Diagnostics.TraceSource.dll;System.Diagnostics.Tracing.dll;System.dll;System.Drawing.dll;System.Drawing.Primitives.dll;System.Dynamic.Runtime.dll;System.Globalization.Calendars.dll;System.Globalization.dll;System.Globalization.Extensions.dll;System.IO.Compression.dll;System.IO.Compression.FileSystem.dll;System.IO.Compression.ZipFile.dll;System.IO.dll;System.IO.FileSystem.dll;System.IO.FileSystem.DriveInfo.dll;System.IO.FileSystem.Primitives.dll;System.IO.FileSystem.Watcher.dll;System.IO.IsolatedStorage.dll;System.IO.MemoryMappedFiles.dll;System.IO.Pipes.AccessControl.dll;System.IO.Pipes.dll;System.IO.Ports.dll;System.IO.UnmanagedMemoryStream.dll;System.Linq.dll;System.Linq.Expressions.dll;System.Linq.Parallel.dll;System.Linq.Queryable.dll;System.Memory.dll;System.Net.dll;System.Net.Http.dll;System.Net.Http.Rtc.dll;System.Net.HttpListener.dll;System.Net.Mail.dll;System.Net.NameResolution.dll;System.Net.NetworkInformation.dll;System.Net.Ping.dll;System.Net.Primitives.dll;System.Net.Requests.dll;System.Net.Security.dll;System.Net.ServicePoint.dll;System.Net.Sockets.dll;System.Net.WebClient.dll;System.Net.WebHeaderCollection.dll;System.Net.WebProxy.dll;System.Net.WebSockets.Client.dll;System.Net.WebSockets.dll;System.Numerics.dll;System.Numerics.Vectors.dll;System.Numerics.Vectors.WindowsRuntime.dll;System.ObjectModel.dll;System.Private.DataContractSerialization.dll;System.Private.Reflection.Metadata.Ecma335.dll;System.Private.ServiceModel.dll;System.Private.Uri.dll;System.Private.Xml.dll;System.Private.Xml.Linq.dll;System.Reflection.Context.dll;System.Reflection.DispatchProxy.dll;System.Reflection.dll;System.Reflection.Emit.dll;System.Reflection.Emit.ILGeneration.dll;System.Reflection.Emit.Lightweight.dll;System.Reflection.Extensions.dll;System.Reflection.Metadata.dll;System.Reflection.Primitives.dll;System.Reflection.TypeExtensions.dll;System.Resources.Reader.dll;System.Resources.ResourceManager.dll;System.Resources.Writer.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Runtime.CompilerServices.VisualC.dll;System.Runtime.dll;System.Runtime.Extensions.dll;System.Runtime.Handles.dll;System.Runtime.InteropServices.dll;System.Runtime.InteropServices.RuntimeInformation.dll;System.Runtime.InteropServices.WindowsRuntime.dll;System.Runtime.Numerics.dll;System.Runtime.Serialization.dll;System.Runtime.Serialization.Formatters.dll;System.Runtime.Serialization.Json.dll;System.Runtime.Serialization.Primitives.dll;System.Runtime.Serialization.Xml.dll;System.Runtime.WindowsRuntime.dll;System.Runtime.WindowsRuntime.UI.Xaml.dll;System.Security.AccessControl.dll;System.Security.Claims.dll;System.Security.Cryptography.Algorithms.dll;System.Security.Cryptography.Cng.dll;System.Security.Cryptography.Csp.dll;System.Security.Cryptography.Encoding.dll;System.Security.Cryptography.Primitives.dll;System.Security.Cryptography.X509Certificates.dll;System.Security.dll;System.Security.Permissions.dll;System.Security.Principal.dll;System.Security.Principal.Windows.dll;System.Security.SecureString.dll;System.ServiceModel.dll;System.ServiceModel.Duplex.dll;System.ServiceModel.Http.dll;System.ServiceModel.NetTcp.dll;System.ServiceModel.Primitives.dll;System.ServiceModel.Security.dll;System.ServiceModel.Web.dll;System.ServiceProcess.dll;System.Text.Encoding.CodePages.dll;System.Text.Encoding.dll;System.Text.Encoding.Extensions.dll;System.Text.RegularExpressions.dll;System.Threading.dll;System.Threading.Overlapped.dll;System.Threading.Tasks.Dataflow.dll;System.Threading.Tasks.dll;System.Threading.Tasks.Extensions.dll;System.Threading.Tasks.Parallel.dll;System.Threading.Thread.dll;System.Threading.ThreadPool.dll;System.Threading.Timer.dll;System.Transactions.dll;System.Transactions.Local.dll;System.ValueTuple.dll;System.Web.dll;System.Web.HttpUtility.dll;System.Windows.dll;System.Xml.dll;System.Xml.Linq.dll;System.Xml.ReaderWriter.dll;System.Xml.Serialization.dll;System.Xml.XDocument.dll;System.Xml.XmlDocument.dll;System.Xml.XmlSerializer.dll;System.Xml.XPath.dll;System.Xml.XPath.XDocument.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;WindowsBase.dll;WindowsInput.dll;Wox.Core.deps.json;Wox.Core.dll;Wox.deps.json;Wox.dll;Wox.exe;Wox.Infrastructure.deps.json;Wox.Infrastructure.dll;Wox.Plugin.deps.json;Wox.Plugin.dll;Wox.runtimeconfig.dev.json;Wox.runtimeconfig.json;PowerToysInterop.dll?>
+        <?foreach File in App.xbf;clrcompression.dll;ColorCode.Core.dll;ColorCode.UWP.dll;ColorCode.UWP.pri;concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;LauncherControl.xbf;Mages.Core.dll;Microsoft.CSharp.dll;Microsoft.Graphics.Canvas.dll;Microsoft.Graphics.Canvas.winmd;Microsoft.Search.Interop.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Parsers.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.pri;Microsoft.Toolkit.Uwp.UI.Animations.dll;Microsoft.Toolkit.Uwp.UI.Animations.pri;Microsoft.Toolkit.Uwp.UI.Controls.dll;Microsoft.Toolkit.Uwp.UI.Controls.pri;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Uwp.UI.pri;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Win32.UI.XamlHost.pri;Microsoft.Toolkit.Win32.UI.XamlHost.winmd;Microsoft.Toolkit.Win32.UI.XamlHost.xml;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.UI.Xaml.pri;Microsoft.UI.Xaml.winmd;Microsoft.VisualBasic.dll;Microsoft.Win32.Primitives.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactions.pri;Microsoft.Xaml.Interactivity.dll;Microsoft.Xaml.Interactivity.pri;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;mscorlib.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;netstandard.dll;Newtonsoft.Json.dll;NHotkey.dll;NHotkey.Wpf.dll;NLog.dll;NLog.Extensions.Logging.dll;NoiseAsset_256x256_PNG.png;Pinyin4Net.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;PowerLauncher.runtimeconfig.dev.json;PowerLauncher.runtimeconfig.json;PowerLauncher.UI.exe;PowerLauncher.UI.xr.xml;PropertyChanged.dll;resources.pri;ResultList.xbf;SQLite.Interop.dll;System.AppContext.dll;System.Buffers.dll;System.Collections.Concurrent.dll;System.Collections.dll;System.Collections.Immutable.dll;System.Collections.NonGeneric.dll;System.Collections.Specialized.dll;System.ComponentModel.Annotations.dll;System.ComponentModel.Composition.dll;System.ComponentModel.DataAnnotations.dll;System.ComponentModel.dll;System.ComponentModel.EventBasedAsync.dll;System.ComponentModel.Primitives.dll;System.ComponentModel.TypeConverter.dll;System.Configuration.dll;System.Console.dll;System.Core.dll;System.Data.Common.dll;System.Data.dll;System.Data.OleDb.dll;System.Data.SqlClient.dll;System.Data.SQLite.dll;System.Diagnostics.Contracts.dll;System.Diagnostics.Debug.dll;System.Diagnostics.DiagnosticSource.dll;System.Diagnostics.FileVersionInfo.dll;System.Diagnostics.Process.dll;System.Diagnostics.StackTrace.dll;System.Diagnostics.TextWriterTraceListener.dll;System.Diagnostics.Tools.dll;System.Diagnostics.TraceSource.dll;System.Diagnostics.Tracing.dll;System.dll;System.Drawing.dll;System.Drawing.Primitives.dll;System.Dynamic.Runtime.dll;System.Globalization.Calendars.dll;System.Globalization.dll;System.Globalization.Extensions.dll;System.IO.Compression.dll;System.IO.Compression.FileSystem.dll;System.IO.Compression.ZipFile.dll;System.IO.dll;System.IO.FileSystem.dll;System.IO.FileSystem.DriveInfo.dll;System.IO.FileSystem.Primitives.dll;System.IO.FileSystem.Watcher.dll;System.IO.IsolatedStorage.dll;System.IO.MemoryMappedFiles.dll;System.IO.Pipes.AccessControl.dll;System.IO.Pipes.dll;System.IO.Ports.dll;System.IO.UnmanagedMemoryStream.dll;System.Linq.dll;System.Linq.Expressions.dll;System.Linq.Parallel.dll;System.Linq.Queryable.dll;System.Memory.dll;System.Net.dll;System.Net.Http.dll;System.Net.Http.Rtc.dll;System.Net.HttpListener.dll;System.Net.Mail.dll;System.Net.NameResolution.dll;System.Net.NetworkInformation.dll;System.Net.Ping.dll;System.Net.Primitives.dll;System.Net.Requests.dll;System.Net.Security.dll;System.Net.ServicePoint.dll;System.Net.Sockets.dll;System.Net.WebClient.dll;System.Net.WebHeaderCollection.dll;System.Net.WebProxy.dll;System.Net.WebSockets.Client.dll;System.Net.WebSockets.dll;System.Numerics.dll;System.Numerics.Vectors.dll;System.Numerics.Vectors.WindowsRuntime.dll;System.ObjectModel.dll;System.Private.DataContractSerialization.dll;System.Private.Reflection.Metadata.Ecma335.dll;System.Private.ServiceModel.dll;System.Private.Uri.dll;System.Private.Xml.dll;System.Private.Xml.Linq.dll;System.Reflection.Context.dll;System.Reflection.DispatchProxy.dll;System.Reflection.dll;System.Reflection.Emit.dll;System.Reflection.Emit.ILGeneration.dll;System.Reflection.Emit.Lightweight.dll;System.Reflection.Extensions.dll;System.Reflection.Metadata.dll;System.Reflection.Primitives.dll;System.Reflection.TypeExtensions.dll;System.Resources.Reader.dll;System.Resources.ResourceManager.dll;System.Resources.Writer.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Runtime.CompilerServices.VisualC.dll;System.Runtime.dll;System.Runtime.Extensions.dll;System.Runtime.Handles.dll;System.Runtime.InteropServices.dll;System.Runtime.InteropServices.RuntimeInformation.dll;System.Runtime.InteropServices.WindowsRuntime.dll;System.Runtime.Numerics.dll;System.Runtime.Serialization.dll;System.Runtime.Serialization.Formatters.dll;System.Runtime.Serialization.Json.dll;System.Runtime.Serialization.Primitives.dll;System.Runtime.Serialization.Xml.dll;System.Runtime.WindowsRuntime.dll;System.Runtime.WindowsRuntime.UI.Xaml.dll;System.Security.AccessControl.dll;System.Security.Claims.dll;System.Security.Cryptography.Algorithms.dll;System.Security.Cryptography.Cng.dll;System.Security.Cryptography.Csp.dll;System.Security.Cryptography.Encoding.dll;System.Security.Cryptography.Primitives.dll;System.Security.Cryptography.X509Certificates.dll;System.Security.dll;System.Security.Permissions.dll;System.Security.Principal.dll;System.Security.Principal.Windows.dll;System.Security.SecureString.dll;System.ServiceModel.dll;System.ServiceModel.Duplex.dll;System.ServiceModel.Http.dll;System.ServiceModel.NetTcp.dll;System.ServiceModel.Primitives.dll;System.ServiceModel.Security.dll;System.ServiceModel.Web.dll;System.ServiceProcess.dll;System.Text.Encoding.CodePages.dll;System.Text.Encoding.dll;System.Text.Encoding.Extensions.dll;System.Text.RegularExpressions.dll;System.Threading.dll;System.Threading.Overlapped.dll;System.Threading.Tasks.Dataflow.dll;System.Threading.Tasks.dll;System.Threading.Tasks.Extensions.dll;System.Threading.Tasks.Parallel.dll;System.Threading.Thread.dll;System.Threading.ThreadPool.dll;System.Threading.Timer.dll;System.Transactions.dll;System.Transactions.Local.dll;System.ValueTuple.dll;System.Web.dll;System.Web.HttpUtility.dll;System.Windows.dll;System.Xml.dll;System.Xml.Linq.dll;System.Xml.ReaderWriter.dll;System.Xml.Serialization.dll;System.Xml.XDocument.dll;System.Xml.XmlDocument.dll;System.Xml.XmlSerializer.dll;System.Xml.XPath.dll;System.Xml.XPath.XDocument.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;WindowsBase.dll;WindowsInput.dll;Wox.Core.deps.json;Wox.Core.dll;Wox.deps.json;Wox.dll;Wox.exe;Wox.Infrastructure.deps.json;Wox.Infrastructure.dll;Wox.Plugin.deps.json;Wox.Plugin.dll;Wox.runtimeconfig.dev.json;Wox.runtimeconfig.json;PowerToysInterop.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll?>
           <File Id="File_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\$(var.File)" />
         <?endforeach?>
         <File Source="$(var.BinX64Dir)SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Lib.dll" />
diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
index 368af7cbd0..dde6a02d0e 100644
--- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
+++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
@@ -66,7 +66,6 @@
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="2.0.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
     <PackageReference Include="NuGet.CommandLine" Version="5.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
index 5f68fe0a85..217ee74eb1 100644
--- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
+++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
@@ -50,8 +50,8 @@
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
     <PackageReference Include="NLog.Schema" Version="4.7.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
     <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
diff --git a/src/modules/launcher/Wox/Wox.csproj b/src/modules/launcher/Wox/Wox.csproj
index 9a78adbf0c..138b869b6e 100644
--- a/src/modules/launcher/Wox/Wox.csproj
+++ b/src/modules/launcher/Wox/Wox.csproj
@@ -61,7 +61,6 @@
     <PackageReference Include="Mages" Version="1.6.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="2.0.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
     <PackageReference Include="NuGet.CommandLine" Version="5.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>