Skip to content

A Swiss Army knife for developers.

Added logs

Etienne Baudouxd8fcb2046009
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9f58428e6..6f99242db 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -33,12 +33,45 @@
<TransformOutOfDateOnly>true</TransformOutOfDateOnly>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+ <DebugSymbols>true</DebugSymbols>
+ <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+ <DebugType>full</DebugType>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'x86'">
+ <PlatformTarget>x86</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'x64'">
+ <PlatformTarget>x64</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'ARM'">
+ <PlatformTarget>ARM</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
+ <PlatformTarget>ARM64</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM' or '$(Configuration)|$(Platform)' == 'Release|ARM64'">
+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ARM</DefineConstants>
+ </PropertyGroup>
+
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<PropertyGroup>
- <Nuget_ColorCodeUwp>2.0.9</Nuget_ColorCodeUwp>
+ <Nuget_ColorCodeUwp>2.0.6</Nuget_ColorCodeUwp>
<Nuget_DiffPlex>1.7.0</Nuget_DiffPlex>
<NuGet_MicrosoftNETCoreUniversalWindowsPlatform>6.2.12</NuGet_MicrosoftNETCoreUniversalWindowsPlatform>
<NuGet_MicrosoftToolkitMvvm>7.0.2</NuGet_MicrosoftToolkitMvvm>
diff --git a/src/dev/def/DevTools.Core/ILogger.cs b/src/dev/def/DevTools.Core/ILogger.cs
new file mode 100644
index 000000000..8b7e97900
--- /dev/null
+++ b/src/dev/def/DevTools.Core/ILogger.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Threading.Tasks;
+
+namespace DevTools.Core
+{
+ public interface ILogger
+ {
+ Task OpenLogsAsync();
+
+ void LogFault(
+ string featureName,
+ Exception ex,
+ string? message = null);
+ }
+}
diff --git a/src/dev/impl/DevTools.Common/DevTools.Common.csproj b/src/dev/impl/DevTools.Common/DevTools.Common.csproj
index a4280dfed..3471fd4e9 100644
--- a/src/dev/impl/DevTools.Common/DevTools.Common.csproj
+++ b/src/dev/impl/DevTools.Common/DevTools.Common.csproj
@@ -17,59 +17,6 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/src/dev/impl/DevTools.Common/LanguageManager.cs b/src/dev/impl/DevTools.Common/LanguageManager.cs
index ef1332ac3..e03349171 100644
--- a/src/dev/impl/DevTools.Common/LanguageManager.cs
+++ b/src/dev/impl/DevTools.Common/LanguageManager.cs
@@ -515,6 +515,11 @@ namespace DevTools.Common
/// </summary>
public string LineNumbersDescription => _resources.GetString("LineNumbersDescription");
+ /// <summary>
+ /// Gets the resource OpenLogs.
+ /// </summary>
+ public string OpenLogs => _resources.GetString("OpenLogs");
+
/// <summary>
/// Gets the resource PrivacyPolicy.
/// </summary>
diff --git a/src/dev/impl/DevTools.Common/Strings/en/Settings.resw b/src/dev/impl/DevTools.Common/Strings/en/Settings.resw
index e752a3c86..da0361139 100644
--- a/src/dev/impl/DevTools.Common/Strings/en/Settings.resw
+++ b/src/dev/impl/DevTools.Common/Strings/en/Settings.resw
@@ -171,6 +171,9 @@
<data name="LineNumbersDescription" xml:space="preserve">
<value>Display line numbers in the text editor</value>
</data>
+ <data name="OpenLogs" xml:space="preserve">
+ <value>Open logs location</value>
+ </data>
<data name="PrivacyPolicy" xml:space="preserve">
<value>Privacy policy</value>
</data>
diff --git a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj
index 42879b29d..91639ad44 100644
--- a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj
+++ b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj
@@ -16,59 +16,6 @@
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -76,6 +23,7 @@
<Compile Include="Clipboard.cs" />
<Compile Include="Injection\MefComposer.cs" />
<Compile Include="Injection\MefProvider.cs" />
+ <Compile Include="Logger.cs" />
<Compile Include="UriActivationProtocolService.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings\SettingsProvider.cs" />
diff --git a/src/dev/impl/DevTools.Core.Impl/Logger.cs b/src/dev/impl/DevTools.Core.Impl/Logger.cs
new file mode 100644
index 000000000..1af7792ec
--- /dev/null
+++ b/src/dev/impl/DevTools.Core.Impl/Logger.cs
@@ -0,0 +1,80 @@
+#nullable enable
+
+using DevTools.Core.Threading;
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.Core;
+using Windows.Storage;
+using Windows.System;
+using Windows.UI.Core;
+
+namespace DevTools.Core.Impl
+{
+ [Export(typeof(ILogger))]
+ internal sealed class Logger : ILogger
+ {
+ private const string LogFileName = "logs.txt";
+
+ private readonly static CoreDispatcher _uiDispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
+
+ private readonly DisposableSempahore _semaphore = new DisposableSempahore();
+
+ public async Task OpenLogsAsync()
+ {
+ StorageFolder localCacheFolder = ApplicationData.Current.LocalCacheFolder;
+
+ IStorageItem file = await localCacheFolder.TryGetItemAsync(LogFileName);
+ if (file is not null and IStorageFile storageFile)
+ {
+ await _uiDispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+ {
+ await Launcher.LaunchFileAsync(storageFile);
+ });
+ }
+ }
+
+ public void LogFault(string featureName, Exception ex, string? message = null)
+ {
+ lock (_semaphore)
+ {
+ LogFaultAsync(featureName, ex, message).ForgetSafely();
+ }
+ }
+
+ private async Task LogFaultAsync(string featureName, Exception ex, string? message)
+ {
+ await TaskScheduler.Default;
+
+ try
+ {
+ using (await _semaphore.WaitAsync(CancellationToken.None))
+ {
+ StorageFolder localCacheFolder = ApplicationData.Current.LocalCacheFolder;
+
+ StorageFile logFile = await localCacheFolder.CreateFileAsync(LogFileName, CreationCollisionOption.OpenIfExists);
+
+ var logsLine = new List<string>
+ {
+ $"# - [{DateTime.Now.ToString("G", DateTimeFormatInfo.InvariantInfo)}]",
+ $"Feature name: {featureName}",
+ $"Custom message: {message}",
+ $"Exception message: {ex.Message}",
+ $"Exception stack trace:",
+ ex.StackTrace,
+ string.Empty // empty line
+ };
+
+ await FileIO.AppendLinesAsync(logFile, logsLine);
+ }
+ }
+ catch (Exception)
+ {
+
+ }
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs b/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs
index a0d22ed8b..3a876d56e 100644
--- a/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs
+++ b/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs
@@ -14,11 +14,13 @@ namespace DevTools.Core.Impl
[Shared]
internal sealed class UriActivationProtocolService : IUriActivationProtocolService
{
+ private readonly ILogger _logger;
private readonly IThread _thread;
[ImportingConstructor]
- public UriActivationProtocolService(IThread thread)
+ public UriActivationProtocolService(ILogger logger, IThread thread)
{
+ _logger = logger;
_thread = thread;
}
@@ -26,9 +28,10 @@ namespace DevTools.Core.Impl
{
return await _thread.RunOnUIThreadAsync(async () =>
{
+ string uriToLaunch = Constants.UriActivationProtocolName;
+
try
{
- string uriToLaunch = Constants.UriActivationProtocolName;
if (!string.IsNullOrWhiteSpace(arguments))
{
@@ -48,7 +51,7 @@ namespace DevTools.Core.Impl
}
catch (Exception ex)
{
- // TODO: log this.
+ _logger.LogFault("Launch new app instance", ex, $"Launch URI: {uriToLaunch}");
}
return false;
diff --git a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
index 085e7fcdf..c16c5382b 100644
--- a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
+++ b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
@@ -17,59 +17,6 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -92,6 +39,7 @@
<Compile Include="ViewModels\Settings\SettingsToolViewModel.cs" />
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="ColorCode.Core" Version="$(Nuget_ColorCodeUwp)" />
<PackageReference Include="ColorCode.UWP" Version="$(Nuget_ColorCodeUwp)" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
index f2f2f0aca..4bac61403 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
@@ -32,6 +32,7 @@ namespace DevTools.Impl.ViewModels
[Export(typeof(MainPageViewModel))]
public sealed class MainPageViewModel : ObservableRecipient
{
+ private readonly ILogger _logger;
private readonly IThread _thread;
private readonly IClipboard _clipboard;
private readonly IToolProviderFactory _toolProviderFactory;
@@ -198,6 +199,7 @@ namespace DevTools.Impl.ViewModels
[ImportingConstructor]
public MainPageViewModel(
+ ILogger logger,
IThread thread,
IClipboard clipboard,
ITitleBar titleBar,
@@ -205,6 +207,7 @@ namespace DevTools.Impl.ViewModels
IUriActivationProtocolService launchProtocolService,
ISettingsProvider settingsProvider)
{
+ _logger = logger;
_thread = thread;
_clipboard = clipboard;
_toolProviderFactory = toolProviderFactory;
@@ -321,7 +324,7 @@ namespace DevTools.Impl.ViewModels
_isUpdatingSelectedItem = true;
if (value is not null)
- {
+ {
_selectedItem = value;
IToolViewModel toolViewModel = _toolProviderFactory.GetToolViewModel(_selectedItem.ToolProvider);
Messenger.Send(new NavigateToToolMessage(toolViewModel, clipboardContentData));
@@ -336,77 +339,84 @@ namespace DevTools.Impl.ViewModels
{
await TaskScheduler.Default;
- var newToolsMenuitems = new Dictionary<MatchedToolProviderViewData, MatchSpan[]?>();
- var footerMenuItems = new List<MatchedToolProviderViewData>();
-
- using (await _sempahore.WaitAsync(CancellationToken.None).ConfigureAwait(false))
+ try
{
- bool firstTime = string.IsNullOrEmpty(searchQuery) && _allToolsMenuitems.Count == 0;
+ var newToolsMenuitems = new Dictionary<MatchedToolProviderViewData, MatchSpan[]?>();
+ var footerMenuItems = new List<MatchedToolProviderViewData>();
- foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetTools(searchQuery))
+ using (await _sempahore.WaitAsync(CancellationToken.None).ConfigureAwait(false))
{
- MatchedToolProviderViewData item;
- MatchSpan[]? matchSpans = null;
- if (firstTime)
- {
- item
- = new MatchedToolProviderViewData(
- _thread,
- matchedToolProvider.Metadata,
- matchedToolProvider.ToolProvider,
- matchedToolProvider.MatchedSpans);
- _allToolsMenuitems.Add(item);
- }
- else
+ bool firstTime = string.IsNullOrEmpty(searchQuery) && _allToolsMenuitems.Count == 0;
+
+ foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetTools(searchQuery))
{
- item
- = _allToolsMenuitems.FirstOrDefault(
- m => string.Equals(
- m.Metadata.Name,
- matchedToolProvider.Metadata.Name,
- StringComparison.Ordinal));
-
- matchSpans = matchedToolProvider.MatchedSpans;
- }
+ MatchedToolProviderViewData item;
+ MatchSpan[]? matchSpans = null;
+ if (firstTime)
+ {
+ item
+ = new MatchedToolProviderViewData(
+ _thread,
+ matchedToolProvider.Metadata,
+ matchedToolProvider.ToolProvider,
+ matchedToolProvider.MatchedSpans);
+ _allToolsMenuitems.Add(item);
+ }
+ else
+ {
+ item
+ = _allToolsMenuitems.FirstOrDefault(
+ m => string.Equals(
+ m.Metadata.Name,
+ matchedToolProvider.Metadata.Name,
+ StringComparison.Ordinal));
+
+ matchSpans = matchedToolProvider.MatchedSpans;
+ }
- newToolsMenuitems[item] = matchSpans;
- }
+ newToolsMenuitems[item] = matchSpans;
+ }
- if (FooterMenuItems.Count == 0)
- {
- foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetFooterTools())
+ if (FooterMenuItems.Count == 0)
{
- footerMenuItems.Add(
- new MatchedToolProviderViewData(
- _thread,
- matchedToolProvider.Metadata,
- matchedToolProvider.ToolProvider,
- matchedToolProvider.MatchedSpans));
+ foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetFooterTools())
+ {
+ footerMenuItems.Add(
+ new MatchedToolProviderViewData(
+ _thread,
+ matchedToolProvider.Metadata,
+ matchedToolProvider.ToolProvider,
+ matchedToolProvider.MatchedSpans));
+ }
}
}
- }
-
- await _thread.RunOnUIThreadAsync(
- ThreadPriority.Low,
- () =>
- {
- var oldSelectedItem = SelectedMenuItem;
- ToolsMenuItems.Clear();
- SelectedMenuItem = null;
- foreach (var item in newToolsMenuitems)
+ await _thread.RunOnUIThreadAsync(
+ ThreadPriority.Low,
+ () =>
{
- if (item.Value is not null)
+ var oldSelectedItem = SelectedMenuItem;
+ ToolsMenuItems.Clear();
+ SelectedMenuItem = null;
+
+ foreach (var item in newToolsMenuitems)
{
- item.Key.MatchedSpans = item.Value;
+ if (item.Value is not null)
+ {
+ item.Key.MatchedSpans = item.Value;
+ }
}
- }
- ToolsMenuItems.Update(newToolsMenuitems.Keys);
- footerMenuItems.ForEach(item => FooterMenuItems.Add(item));
+ ToolsMenuItems.Update(newToolsMenuitems.Keys);
+ footerMenuItems.ForEach(item => FooterMenuItems.Add(item));
- SelectedMenuItem = oldSelectedItem;
- });
+ SelectedMenuItem = oldSelectedItem;
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogFault("Update main menu after a search", ex, $"Search query: {searchQuery}");
+ }
}
private async Task UpdateRecommendedToolsAsync()
@@ -441,7 +451,7 @@ namespace DevTools.Impl.ViewModels
}
catch (Exception ex)
{
- // TODO: Log this.
+ _logger.LogFault("Check if tool is recommended", ex, $"Tool : {tool.Metadata.Name}");
}
}));
}
@@ -464,7 +474,7 @@ namespace DevTools.Impl.ViewModels
// The recommended tool is different that the ones that were recommended before (if any...).
// Let's select automatically this tool.
await _thread.RunOnUIThreadAsync(
- ThreadPriority.High,
+ ThreadPriority.High,
() =>
{
if (!IsInCompactOverlayMode && _allowSelectAutomaticallyRecommendedTool)
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs
index b7d69dc62..174ed9bb7 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs
@@ -21,6 +21,7 @@ namespace DevTools.Impl.ViewModels.Settings
[Export(typeof(SettingsToolViewModel))]
public sealed class SettingsToolViewModel : ObservableRecipient, IToolViewModel
{
+ private readonly ILogger _logger;
private readonly IThread _thread;
private readonly IWindowManager _windowManager;
private readonly ISettingsProvider _settingsProvider;
@@ -80,10 +81,12 @@ namespace DevTools.Impl.ViewModels.Settings
[ImportingConstructor]
public SettingsToolViewModel(
+ ILogger logger,
IThread thread,
IWindowManager windowManager,
ISettingsProvider settingsProvider)
{
+ _logger = logger;
_thread = thread;
_windowManager = windowManager;
_settingsProvider = settingsProvider;
@@ -92,6 +95,7 @@ namespace DevTools.Impl.ViewModels.Settings
ThirdPartyNoticesCommand = new AsyncRelayCommand(ExecuteThirdPartyNoticesCommandAsync);
LicenseCommand = new AsyncRelayCommand(ExecuteLicenseCommandAsync);
RateAndReviewCommand = new AsyncRelayCommand(ExecuteRateAndReviewCommandAsync);
+ OpenLogsCommand = new AsyncRelayCommand(ExecuteOpenLogsCommandAsync);
}
#region PrivacyPolicyCommand
@@ -154,5 +158,16 @@ namespace DevTools.Impl.ViewModels.Settings
}
#endregion
+
+ #region OpenLogsCommand
+
+ internal IAsyncRelayCommand OpenLogsCommand { get; }
+
+ private async Task ExecuteOpenLogsCommandAsync()
+ {
+ await _logger.OpenLogsAsync();
+ }
+
+ #endregion
}
}
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml
index cbd7db2cf..6ffa44728 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml
+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml
@@ -143,5 +143,17 @@
</Grid>
</controls:ExpandableSettingControl.ExpandableContent>
</controls:ExpandableSettingControl>
+
+ <controls:ExpandableSettingControl
+ Title="{x:Bind ViewModel.Strings.OpenLogs}">
+ <controls:ExpandableSettingControl.Icon>
+ <FontIcon Glyph="&#x0032;" />
+ </controls:ExpandableSettingControl.Icon>
+ <Button
+ ToolTipService.ToolTip="{x:Bind ViewModel.Strings.OpenLogs}"
+ Command="{x:Bind ViewModel.OpenLogsCommand}">
+ <FontIcon Glyph="&#xF582;"/>
+ </Button>
+ </controls:ExpandableSettingControl>
</StackPanel>
</Page>
diff --git a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
index 7df93f373..7ab19ae13 100644
--- a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
+++ b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
@@ -15,59 +15,6 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
index 359a959d1..3ca965f13 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
@@ -1,6 +1,7 @@
#nullable enable
using DevTools.Common;
+using DevTools.Core;
using DevTools.Core.Threading;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System;
@@ -22,6 +23,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
private string _encodingMode = DefaultEncoding;
private string _conversionMode = DefaultConversion;
private bool _conversionInProgress;
+ private readonly ILogger _logger;
private readonly IThread _thread;
private readonly Queue<string> _conversionQueue = new();
@@ -83,8 +85,9 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
}
[ImportingConstructor]
- public Base64EncoderDecoderToolViewModel(IThread thread)
+ public Base64EncoderDecoderToolViewModel(ILogger logger, IThread thread)
{
+ _logger = logger;
_thread = thread;
}
@@ -107,21 +110,19 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
while (_conversionQueue.TryDequeue(out string text))
{
- Task<string>? conversionResult = null;
+ string conversionResult;
if (string.Equals(ConversionMode, DefaultConversion, StringComparison.Ordinal))
{
- conversionResult = EncodeBase64DataAsync(text);
+ conversionResult = await EncodeBase64DataAsync(text).ConfigureAwait(false);
}
else
{
- conversionResult = DecodeBase64DataAsync(text);
+ conversionResult = await DecodeBase64DataAsync(text).ConfigureAwait(false);
}
- await Task.WhenAll(conversionResult).ConfigureAwait(false);
-
_thread.RunOnUIThreadAsync(ThreadPriority.Low, () =>
{
- OutputValue = conversionResult.Result;
+ OutputValue = conversionResult;
}).ForgetSafely();
}
@@ -137,7 +138,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
await TaskScheduler.Default;
- string? encoded;
+ string encoded = string.Empty;
try
{
@@ -145,9 +146,10 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
byte[] dataBytes = encoder.GetBytes(data);
encoded = Convert.ToBase64String(dataBytes);
}
- catch (Exception)
+ catch (Exception ex)
{
- return string.Empty;
+ _logger.LogFault("Base 64 - Encoder", ex, $"Encoding mode: {EncodingMode}");
+ return ex.Message;
}
return encoded;
@@ -161,7 +163,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
}
await TaskScheduler.Default;
- string? decoded;
+ string decoded = string.Empty;
try
{
@@ -169,9 +171,14 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
Encoding encoder = GetEncoder();
decoded = encoder.GetString(decodedData);
}
- catch (Exception)
+ catch (FormatException)
{
- return string.Empty;
+ // ignore;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogFault("Base 64 - Decoder", ex, $"Encoding mode: {EncodingMode}");
+ return ex.Message;
}
return decoded;
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs
index 97caeed41..d640c1709 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs
@@ -1,6 +1,7 @@
#nullable enable
using DevTools.Common;
+using DevTools.Core;
using DevTools.Core.Threading;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System;
@@ -16,6 +17,7 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
[Export(typeof(HashGeneratorToolViewModel))]
public sealed class HashGeneratorToolViewModel : ObservableRecipient, IToolViewModel
{
+ private readonly ILogger _logger;
private readonly IThread _thread;
private readonly Queue<string> _hashCalculationQueue = new();
@@ -76,8 +78,9 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
}
[ImportingConstructor]
- public HashGeneratorToolViewModel(IThread thread)
+ public HashGeneratorToolViewModel(ILogger logger, IThread thread)
{
+ _logger = logger;
_thread = thread;
}
@@ -128,20 +131,28 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
await TaskScheduler.Default;
- HashAlgorithmProvider algorithmProvider = HashAlgorithmProvider.OpenAlgorithm(alrogithmName);
+ try
+ {
+ HashAlgorithmProvider algorithmProvider = HashAlgorithmProvider.OpenAlgorithm(alrogithmName);
- IBuffer buffer = CryptographicBuffer.ConvertStringToBinary(text, BinaryStringEncoding.Utf8);
- buffer = algorithmProvider.HashData(buffer);
+ IBuffer buffer = CryptographicBuffer.ConvertStringToBinary(text, BinaryStringEncoding.Utf8);
+ buffer = algorithmProvider.HashData(buffer);
- string hash = CryptographicBuffer.EncodeToHexString(buffer);
+ string hash = CryptographicBuffer.EncodeToHexString(buffer);
- if (IsUppercase)
- {
- return hash.ToUpperInvariant();
+ if (IsUppercase)
+ {
+ return hash.ToUpperInvariant();
+ }
+ else
+ {
+ return hash.ToLowerInvariant();
+ }
}
- else
+ catch (Exception ex)
{
- return hash.ToLowerInvariant();
+ _logger.LogFault("Hash Generator", ex, $"Alrogithm name: {alrogithmName}");
+ return ex.Message;
}
}
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs
index 532e122bb..4272b5e37 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs
@@ -1,6 +1,7 @@
#nullable enable
using DevTools.Common;
+using DevTools.Core;
using DevTools.Core.Injection;
using DevTools.Core.Threading;
using Newtonsoft.Json;
@@ -17,6 +18,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
[NotScrollable]
internal sealed class JsonFormatterToolProvider : ToolProviderBase, IToolProvider
{
+ private readonly ILogger _logger;
private readonly IMefProvider _mefProvider;
public string DisplayName => LanguageManager.Instance.JsonFormatter.DisplayName;
@@ -24,9 +26,10 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
public object IconSource => CreatePathIconFromPath(nameof(JsonFormatterToolProvider));
[ImportingConstructor]
- public JsonFormatterToolProvider(IThread thread, IMefProvider mefProvider)
+ public JsonFormatterToolProvider(ILogger logger, IThread thread, IMefProvider mefProvider)
: base(thread)
{
+ _logger = logger;
_mefProvider = mefProvider;
}
@@ -40,7 +43,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
return _mefProvider.Import<JsonFormatterToolViewModel>();
}
- private static bool IsValidJson(string input)
+ private bool IsValidJson(string input)
{
if (string.IsNullOrWhiteSpace(input))
{
@@ -64,7 +67,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
}
catch (Exception ex) //some other exception
{
- // TODO: Log this.
+ _logger.LogFault("Check is string if JSON", ex);
return false;
}
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
index 430a62215..90911ebf1 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
@@ -26,6 +26,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
private const string OneTabIndentation = "OneTab";
private const string NoIndentation = "Minified";
+ private readonly ILogger _logger;
private readonly IThread _thread;
private readonly Queue<string> _formattingQueue = new();
@@ -68,8 +69,9 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
internal IFormattedTextBlock? OutputTextBlock { private get; set; }
[ImportingConstructor]
- public JsonFormatterToolViewModel(IThread thread, ISettingsProvider settingsProvider)
+ public JsonFormatterToolViewModel(ILogger logger, IThread thread, ISettingsProvider settingsProvider)
{
+ _logger = logger;
_thread = thread;
SettingsProvider = settingsProvider;
}
@@ -175,7 +177,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
}
catch (Exception ex) //some other exception
{
- // TODO: Log this.
+ _logger.LogFault("Json formatter", ex, $"Indentation: {Indentation}");
output = ex.Message;
return false;
}
diff --git a/src/dev/shared/SharedAssemblyInfo.cs b/src/dev/shared/SharedAssemblyInfo.cs
index 6f17b3daa..e11abad30 100644
--- a/src/dev/shared/SharedAssemblyInfo.cs
+++ b/src/dev/shared/SharedAssemblyInfo.cs
@@ -34,7 +34,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyVersion("2021.09.24.0")]
+[assembly: AssemblyFileVersion("2021.09.24.0")]
-[assembly: InternalsVisibleTo("DevTools.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("DevTools.Tests")]
diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.cs
index f8584fbe2..05355f9d1 100644
--- a/src/dev/startup/DevTools/App.xaml.cs
+++ b/src/dev/startup/DevTools/App.xaml.cs
@@ -55,6 +55,8 @@ namespace DevTools
typeof(Impl.Dummy).Assembly);
});
+ UnhandledException += OnUnhandledException;
+
// Importing it in a Lazy because we can't import it before a Window is created.
_themeListener = new Lazy<Task<IThemeListener>>(async () => (await _mefComposer).ExportProvider.GetExport<IThemeListener>());
@@ -172,6 +174,11 @@ namespace DevTools
deferral.Complete();
}
+ private async void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
+ {
+ (await _mefComposer).ExportProvider.GetExport<ILogger>().LogFault("Unhandled problem", e.Exception);
+ }
+
private async Task<Frame> EnsureWindowIsInitializedAsync()
{
ApplicationView applicationView = ApplicationView.GetForCurrentView();
diff --git a/src/dev/startup/DevTools/DevTools.csproj b/src/dev/startup/DevTools/DevTools.csproj
index a61d98880..7b1707e3b 100644
--- a/src/dev/startup/DevTools/DevTools.csproj
+++ b/src/dev/startup/DevTools/DevTools.csproj
@@ -17,59 +17,6 @@
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/src/tests/DevTools.Tests/DevTools.Tests.csproj b/src/tests/DevTools.Tests/DevTools.Tests.csproj
index 6a67d4c1c..f8840d427 100644
--- a/src/tests/DevTools.Tests/DevTools.Tests.csproj
+++ b/src/tests/DevTools.Tests/DevTools.Tests.csproj
@@ -17,59 +17,6 @@
<UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>ARM64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
<ItemGroup>
<SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
</ItemGroup>