Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 11:46:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[fxcop] Settings UI runner (#7485)

Browse Source 
* Enable FxCop for Microsoft.PowerToys.Settings.UI.Runner

* Log exceptions in WindowsXamlHost_ChildChanged

* Add Debugger.Break in debug mode

* Move Debugger.Break into Logger class
This commit is contained in:
Luthfi Mawarid
2020-10-26 11:09:18 -07:00
committed by GitHub
parent ec22bc40bc
commit 39ebd82e20
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs
View File

@@ -32,6 +32,14 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
Log(message, "INFO"); Log(message, "INFO");
} }
public static void LogError(string message)
{
Log(message, "ERROR");
#if DEBUG
Debugger.Break();
#endif
}
public static void LogError(string message, Exception e) public static void LogError(string message, Exception e)
{ {
Log( Log(
@@ -42,6 +50,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
"Stack trace: " + Environment.NewLine + "Stack trace: " + Environment.NewLine +
e?.StackTrace, e?.StackTrace,
"ERROR"); "ERROR");
#if DEBUG
Debugger.Break();
#endif
} }
private static void Log(string message, string type) private static void Log(string message, string type)

8
src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
View File

@@ -5,6 +5,7 @@
using System; using System;
using System.Windows; using System.Windows;
using Microsoft.PowerLauncher.Telemetry; using Microsoft.PowerLauncher.Telemetry;
using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Microsoft.PowerToys.Settings.UI.Views; using Microsoft.PowerToys.Settings.UI.Views;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.Toolkit.Wpf.UI.XamlHost; using Microsoft.Toolkit.Wpf.UI.XamlHost;
@@ -67,16 +68,17 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
{ {
if (ShellPage.ShellHandler.IPCResponseHandleList != null) if (ShellPage.ShellHandler.IPCResponseHandleList != null)
{ {
try var success = JsonObject.TryParse(msg, out JsonObject json);
if (success)
{ {
JsonObject json = JsonObject.Parse(msg);
foreach (Action<JsonObject> handle in ShellPage.ShellHandler.IPCResponseHandleList) foreach (Action<JsonObject> handle in ShellPage.ShellHandler.IPCResponseHandleList)
{ {
handle(json); handle(json);
} }
} }
catch (Exception) else
{ {
Logger.LogError("Failed to parse JSON from IPC message.");
} }
} }
}; };

5
src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
View File

@@ -69,6 +69,11 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" /> <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
<Version>3.3.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/core/Microsoft.PowerToys.Settings.UI.Runner/Program.cs
View File

@@ -13,7 +13,7 @@ using Windows.UI.Popups;
namespace Microsoft.PowerToys.Settings.UI.Runner namespace Microsoft.PowerToys.Settings.UI.Runner
{ {
public class Program public static class Program
{ {
// Quantity of arguments // Quantity of arguments
private const int ArgumentsQty = 5; private const int ArgumentsQty = 5;
@@ -37,9 +37,9 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
App app = new App(); App app = new App();
app.InitializeComponent(); app.InitializeComponent();
if (args.Length >= ArgumentsQty) if (args != null && args.Length >= ArgumentsQty)
{ {
int.TryParse(args[2], out int powerToysPID); _ = int.TryParse(args[2], out int powerToysPID);
PowerToysPID = powerToysPID; PowerToysPID = powerToysPID;
if (args[4] == "true") if (args[4] == "true")