A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Open In A New Window, Added unit tests, Fixed bugs
Etienne Baudouxcc994918693b
diff --git a/src/DevTools.sln b/src/DevTools.slnindex cfc69eff3..c4d4b829d 100644--- a/src/DevTools.sln+++ b/src/DevTools.sln@@ -40,6 +40,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Localization", "deEndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Impl", "dev\impl\DevTools.Impl\DevTools.Impl.csproj", "{E2F0C303-04FC-4504-A272-7662AF9A0A80}"EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Tests", "tests\DevTools.Tests\DevTools.Tests.csproj", "{E1C4AB49-CFFF-420E-A182-E3028BD0493C}"+EndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolutionDebug|ARM = Debug|ARM@@ -188,6 +190,30 @@ Global{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x64.Build.0 = Release|x64{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x86.ActiveCfg = Release|x86{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x86.Build.0 = Release|x86+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.ActiveCfg = Debug|ARM+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Build.0 = Debug|ARM+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Deploy.0 = Debug|ARM+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.ActiveCfg = Debug|ARM64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Build.0 = Debug|ARM64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Deploy.0 = Debug|ARM64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.ActiveCfg = Debug|x64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Build.0 = Debug|x64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Deploy.0 = Debug|x64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.ActiveCfg = Debug|x86+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.Build.0 = Debug|x86+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.Deploy.0 = Debug|x86+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.ActiveCfg = Release|ARM+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Build.0 = Release|ARM+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Deploy.0 = Release|ARM+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.ActiveCfg = Release|ARM64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Build.0 = Release|ARM64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Deploy.0 = Release|ARM64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.ActiveCfg = Release|x64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Build.0 = Release|x64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Deploy.0 = Release|x64+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.ActiveCfg = Release|x86+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.Build.0 = Release|x86+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.Deploy.0 = Release|x86EndGlobalSectionGlobalSection(SolutionProperties) = preSolutionHideSolutionNode = FALSE@@ -205,6 +231,7 @@ Global{8621ED11-E9DD-480A-BE2B-C1DB00919B6F} = {AC0D0928-8390-4929-801E-A9923DBB369F}{935D5DF8-C400-4CA6-AABE-34A06A69AF85} = {AC0D0928-8390-4929-801E-A9923DBB369F}{E2F0C303-04FC-4504-A272-7662AF9A0A80} = {AC0D0928-8390-4929-801E-A9923DBB369F}+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C} = {F8A9E843-7AC1-414A-8F27-A8F416D2D489}EndGlobalSectionGlobalSection(ExtensibilityGlobals) = postSolutionSolutionGuid = {78B10789-385B-4F7D-8E06-D86143CD76B5}diff --git a/src/dev/def/DevTools.Core/Constants.cs b/src/dev/def/DevTools.Core/Constants.csnew file mode 100644index 000000000..7a13ec83f--- /dev/null+++ b/src/dev/def/DevTools.Core/Constants.cs@@ -0,0 +1,9 @@+namespace DevTools.Core+{+ public static class Constants+ {+ public const string UriActivationProtocolName = "devtools://";++ public const string UriActivationProtocolToolArgument = "tool";+ }+}diff --git a/src/dev/def/DevTools.Core/ILaunchProtocolService.cs b/src/dev/def/DevTools.Core/IUriActivationProtocolService.cssimilarity index 73%rename from src/dev/def/DevTools.Core/ILaunchProtocolService.csrename to src/dev/def/DevTools.Core/IUriActivationProtocolService.csindex d509dbdfd..223d34688 100644--- a/src/dev/def/DevTools.Core/ILaunchProtocolService.cs+++ b/src/dev/def/DevTools.Core/IUriActivationProtocolService.cs@@ -3,9 +3,9 @@namespace DevTools.Core{/// <summary>- /// Provides a service allowing to start new instance of the app.+ /// Provides a service allowing to activate the app throught a URI protocol./// </summary>- public interface ILaunchProtocolService+ public interface IUriActivationProtocolService{/// <summary>/// Starts a new instance of the app with an argument.diff --git a/src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.cs b/src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.csindex 3c9136da1..c3c9f476d 100644--- a/src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.cs+++ b/src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.cs@@ -13,7 +13,7 @@ namespace DevTools.Core.Threading/// <summary>/// Gets the task being watched. This property never changes and is never <c>null</c>./// </summary>- public Task<TResult?>? Task { get; private set; }+ public Task<TResult>? Task { get; private set; }/// <summary>/// Gets the result of the task. Returns the default value of TResult if the task has not completed successfully.@@ -49,7 +49,7 @@ namespace DevTools.Core.Threading/// Initialize a new instance of the <see cref="TaskCompletionNotifier{TResult}"/> class./// </summary>/// <param name="task">The <see cref="Task"/> to run.</param>- public TaskCompletionNotifier(Task<TResult?>? task)+ public TaskCompletionNotifier(IThread thread, Task<TResult>? task){try{@@ -60,25 +60,28 @@ namespace DevTools.Core.Threadingtask.ContinueWith(- t =>+ async t =>{var propertyChanged = PropertyChanged;if (propertyChanged != null){- propertyChanged(this, new PropertyChangedEventArgs(nameof(IsCompleted)));- if (t.IsCanceled)+ await thread.RunOnUIThreadAsync(() =>{- propertyChanged(this, new PropertyChangedEventArgs(nameof(IsCanceled)));- }- else if (t.IsFaulted)- {- propertyChanged(this, new PropertyChangedEventArgs(nameof(IsFaulted)));- }- else- {- propertyChanged(this, new PropertyChangedEventArgs(nameof(IsSuccessfullyCompleted)));- propertyChanged(this, new PropertyChangedEventArgs(nameof(Result)));- }+ propertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsCompleted)));+ if (t.IsCanceled)+ {+ propertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsCanceled)));+ }+ else if (t.IsFaulted)+ {+ propertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsFaulted)));+ }+ else+ {+ propertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsSuccessfullyCompleted)));+ propertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(Result)));+ }+ });}},CancellationToken.None,diff --git a/src/dev/def/DevTools.Providers/DevTools.Providers.csproj b/src/dev/def/DevTools.Providers/DevTools.Providers.csprojindex dc277a325..b27943642 100644--- a/src/dev/def/DevTools.Providers/DevTools.Providers.csproj+++ b/src/dev/def/DevTools.Providers/DevTools.Providers.csproj@@ -9,7 +9,10 @@</Compile></ItemGroup><ItemGroup>- <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)"/>+ <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />+ </ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\DevTools.Core\DevTools.Core.csproj" /></ItemGroup></Project>diff --git a/src/dev/def/DevTools.Providers/MatchedToolProvider.cs b/src/dev/def/DevTools.Providers/MatchedToolProvider.csindex 095249dd8..0929d96c2 100644--- a/src/dev/def/DevTools.Providers/MatchedToolProvider.cs+++ b/src/dev/def/DevTools.Providers/MatchedToolProvider.cs@@ -1,17 +1,46 @@-using System;+using DevTools.Core;+using System;+using System.ComponentModel;namespace DevTools.Providers{- public class MatchedToolProvider+ /// <summary>+ /// Represents a tool provider that matched a certain search.+ /// </summary>+ public class MatchedToolProvider : INotifyPropertyChanged{+ private MatchSpan[] _matchedSpans = Array.Empty<MatchSpan>();++ /// <summary>+ /// Gets the tool provider.+ /// </summary>public IToolProvider ToolProvider { get; }- public MatchSpan[] MatchedSpans { get; }+ /// <summary>+ /// Gets or sets the list of spans that matched the search in the <see cref="IToolProvider.DisplayName"/>.+ /// </summary>+ public MatchSpan[] MatchedSpans+ {+ get => _matchedSpans;+ set+ {+ _matchedSpans = value;+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MatchedSpans)));+ }+ }++ /// <summary>+ /// Gets the metadata of the tool provider.+ /// </summary>+ public ToolProviderMetadata Metadata { get; }++ public event PropertyChangedEventHandler? PropertyChanged;- public MatchedToolProvider(IToolProvider toolProvider, MatchSpan[] matchedSpans)+ public MatchedToolProvider(ToolProviderMetadata metadata, IToolProvider toolProvider, MatchSpan[] matchedSpans){- ToolProvider = toolProvider ?? throw new ArgumentNullException();- MatchedSpans = matchedSpans ?? throw new ArgumentNullException();+ Metadata = Arguments.NotNull(metadata, nameof(metadata));+ ToolProvider = Arguments.NotNull(toolProvider, nameof(toolProvider));+ MatchedSpans = Arguments.NotNull(matchedSpans, nameof(matchedSpans));}}}diff --git a/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs b/src/dev/def/DevTools.Providers/ProtocolNameAttribute.csnew file mode 100644index 000000000..a06078eb7--- /dev/null+++ b/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs@@ -0,0 +1,26 @@+using System;+using System.Composition;+using System.Linq;++namespace DevTools.Providers+{+ [MetadataAttribute]+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]+ public sealed class ProtocolNameAttribute : Attribute+ {+ public string ProtocolName { get; set; }++ public ProtocolNameAttribute(string protocolName)+ {+ if (string.IsNullOrWhiteSpace(protocolName)+ || !protocolName!.All(+ c => char.IsDigit(c)+ || (char.IsLetter(c) && char.IsLower(c))))+ {+ throw new ArgumentException("The protocol name should only have letters or digits and should be in lower case.");+ }++ ProtocolName = protocolName;+ }+ }+}diff --git a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs b/src/dev/def/DevTools.Providers/ToolProviderMetadata.csindex 2b77ec95c..859450e43 100644--- a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs+++ b/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs@@ -4,13 +4,28 @@ namespace DevTools.Providers{public sealed class ToolProviderMetadata{+ /// <summary>+ /// Gets the internal non-localized name of the provider.+ /// </summary>[DefaultValue("Unnamed")]- public string? Name { get; set; }+ public string Name { get; set; } = string.Empty;+ /// <summary>+ /// Gets the order in which this tool should appear.+ /// </summary>[DefaultValue(int.MaxValue)]public int? Order { get; set; }+ /// <summary>+ /// Gets whether the tool should be displayed in the footer of the menu.+ /// </summary>[DefaultValue(false)]public bool IsFooterItem { get; set; }++ /// <summary>+ /// Gets or sets the tool name used through URI Activation Protocol to access this tool.+ /// </summary>+ [DefaultValue("")]+ public string ProtocolName { get; set; } = string.Empty;}}diff --git a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csprojindex 4165ef7ac..1be85ae4e 100644--- a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj+++ b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj@@ -75,6 +75,7 @@</Compile><Compile Include="Injection\MefComposer.cs" /><Compile Include="Injection\MefProvider.cs" />+ <Compile Include="UriActivationProtocolService.cs" /><Compile Include="Properties\AssemblyInfo.cs" /><Compile Include="Settings\SettingsProvider.cs" /><Compile Include="Theme\ThemeListener.cs" />diff --git a/src/dev/impl/DevTools.Core.Impl/Threading/Thread.cs b/src/dev/impl/DevTools.Core.Impl/Threading/Thread.csindex 4cf8fd202..279499849 100644--- a/src/dev/impl/DevTools.Core.Impl/Threading/Thread.cs+++ b/src/dev/impl/DevTools.Core.Impl/Threading/Thread.cs@@ -69,6 +69,7 @@ namespace DevTools.Core.Impl.Threading{try{+ ThrowIfNotOnUIThread();await action().ConfigureAwait(true);}catch (Exception ex)@@ -104,6 +105,7 @@ namespace DevTools.Core.Impl.Threading{try{+ ThrowIfNotOnUIThread();result = await action().ConfigureAwait(true);}catch (Exception ex)diff --git a/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs b/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.csnew file mode 100644index 000000000..a0d22ed8b--- /dev/null+++ b/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs@@ -0,0 +1,58 @@+#nullable enable++using DevTools.Core.Threading;+using System;+using System.Composition;+using System.Globalization;+using System.Threading.Tasks;+using Windows.ApplicationModel;+using Windows.System;++namespace DevTools.Core.Impl+{+ [Export(typeof(IUriActivationProtocolService))]+ [Shared]+ internal sealed class UriActivationProtocolService : IUriActivationProtocolService+ {+ private readonly IThread _thread;++ [ImportingConstructor]+ public UriActivationProtocolService(IThread thread)+ {+ _thread = thread;+ }++ public async Task<bool> LaunchNewAppInstance(string? arguments = null)+ {+ return await _thread.RunOnUIThreadAsync(async () =>+ {+ try+ {+ string uriToLaunch = Constants.UriActivationProtocolName;++ if (!string.IsNullOrWhiteSpace(arguments))+ {+ uriToLaunch += $"?{Constants.UriActivationProtocolToolArgument}={arguments}";+ }++ var launchOptions+ = new LauncherOptions+ {+ TargetApplicationPackageFamilyName = Package.Current.Id.FamilyName,+ };++ return+ await Launcher.LaunchUriAsync(+ new Uri(uriToLaunch.ToLower(CultureInfo.CurrentCulture)),+ launchOptions);+ }+ catch (Exception ex)+ {+ // TODO: log this.+ }++ return false;+ });+ }+ }+}diff --git a/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs b/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.csindex ce77e182b..ea16ad8e1 100644--- a/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs+++ b/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs@@ -1,14 +1,15 @@-using DevTools.Providers;+using DevTools.Core.Threading;+using DevTools.Providers;using Windows.UI.Xaml.Controls;namespace DevTools.Impl.Models{public sealed class MatchedToolProviderViewData : MatchedToolProvider{- internal IconElement Icon => (IconElement)ToolProvider.IconSource;+ internal TaskCompletionNotifier<IconElement> Icon => (TaskCompletionNotifier<IconElement>)ToolProvider.IconSource;- public MatchedToolProviderViewData(IToolProvider toolProvider, MatchSpan[] matchedSpans)- : base(toolProvider, matchedSpans)+ public MatchedToolProviderViewData(ToolProviderMetadata metadata, IToolProvider toolProvider, MatchSpan[] matchedSpans)+ : base(metadata, toolProvider, matchedSpans){}}diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.csindex 2bdee9d6a..76d8dde9e 100644--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs@@ -1,25 +1,36 @@#nullable enableusing DevTools.Core;-using DevTools.Core.Injection;+using DevTools.Core.Threading;using DevTools.Impl.Models;-using DevTools.Impl.Views;using DevTools.Localization;using DevTools.Providers;using Microsoft.Toolkit.Mvvm.ComponentModel;using Microsoft.Toolkit.Mvvm.Input;using System;+using System.Collections.Generic;using System.Collections.ObjectModel;+using System.Collections.Specialized;using System.Composition;+using System.Globalization;+using System.Linq;+using System.Threading;using System.Threading.Tasks;+using System.Web;namespace DevTools.Impl.ViewModels{[Export(typeof(MainPageViewModel))]public sealed class MainPageViewModel : ObservableRecipient{- private readonly IMefProvider _mefProvider;+ private readonly IThread _thread;private readonly IToolProviderFactory _toolProviderFactory;+ private readonly IUriActivationProtocolService _launchProtocolService;+ private readonly List<MatchedToolProviderViewData> _allToolsMenuitems = new();+ private readonly DisposableSempahore _sempahore = new();++ private MatchedToolProviderViewData? _selectedItem;+ private string? _searchQuery;internal MainPageStrings Strings = LanguageManager.Instance.MainPage;@@ -33,71 +44,184 @@ namespace DevTools.Impl.ViewModels/// </summary>internal ObservableCollection<MatchedToolProviderViewData> FooterMenuItems { get; } = new();+ /// <summary>+ /// Gets or sets the selected menu item in the NavitationView.+ /// </summary>+ internal MatchedToolProviderViewData? SelectedMenuItem+ {+ get => _selectedItem;+ set+ {+ _thread.ThrowIfNotOnUIThread();+ if (value is not null)+ {+ _selectedItem = value;+ OnPropertyChanged(nameof(SelectedMenuItem));+ }+ }+ }+/// <summary>/// The search query in the search bar./// </summary>- internal string? SearchQuery { get; set; }+ internal string? SearchQuery+ {+ get => _searchQuery;+ set+ {+ _thread.ThrowIfNotOnUIThread();+ if (_searchQuery != value)+ {+ _searchQuery = value;+ OnPropertyChanged();+ UpdateMenuAsync(value).Forget();+ }+ }+ }[ImportingConstructor]public MainPageViewModel(- IMefProvider mefProvider,- IToolProviderFactory toolProviderFactory)+ IThread thread,+ IToolProviderFactory toolProviderFactory,+ IUriActivationProtocolService launchProtocolService){- _mefProvider = mefProvider;+ _thread = thread;_toolProviderFactory = toolProviderFactory;+ _launchProtocolService = launchProtocolService;- SearchBoxTextChangedCommand = new RelayCommand(ExecuteSearchBoxTextChangedCommand);- OpenToolInNewWindowCommand = new AsyncRelayCommand<IToolProvider>(ExecuteOpenToolInNewWindowCommandAsync);-- SetFooterMenuItems();- SearchTools(searchQuery: string.Empty);+ OpenToolInNewWindowCommand = new AsyncRelayCommand<ToolProviderMetadata>(ExecuteOpenToolInNewWindowCommandAsync);}- #region SearchBoxTextChangedCommand-- internal IRelayCommand SearchBoxTextChangedCommand { get; }-- private void ExecuteSearchBoxTextChangedCommand()- {- SearchTools(SearchQuery);- }-- #endregion-#region OpenToolInNewWindowCommand- public IRelayCommand<IToolProvider> OpenToolInNewWindowCommand { get; }+ public IRelayCommand<ToolProviderMetadata> OpenToolInNewWindowCommand { get; }- private async Task ExecuteOpenToolInNewWindowCommandAsync(IToolProvider? toolProvider)+ private async Task ExecuteOpenToolInNewWindowCommandAsync(ToolProviderMetadata? metadata){- Arguments.NotNull(toolProvider, nameof(toolProvider));-- // await _windowManager.OpenNewWindowAsync(typeof(MainPage), toolProvider);+ Arguments.NotNull(metadata, nameof(metadata));+ await _launchProtocolService.LaunchNewAppInstance(metadata!.ProtocolName);}#endregion- private void SearchTools(string? searchQuery)+ /// <summary>+ /// Invoked when the Page is loaded and becomes the current source of a parent Frame.+ /// </summary>+ internal async Task OnNavigatedToAsync(object? arguments){- ToolsMenuItems.Clear();- foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetTools(searchQuery))+ await UpdateMenuAsync(searchQuery: string.Empty).ConfigureAwait(false);++ if (arguments is string argumentsString && !string.IsNullOrWhiteSpace(argumentsString)){- ToolsMenuItems.Add(- new MatchedToolProviderViewData(- matchedToolProvider.ToolProvider,- matchedToolProvider.MatchedSpans));+ NameValueCollection parameters = HttpUtility.ParseQueryString(argumentsString.ToLower(CultureInfo.CurrentCulture));+ string? toolProviderProtocolName = parameters.Get(Constants.UriActivationProtocolToolArgument);++ if (!string.IsNullOrWhiteSpace(toolProviderProtocolName))+ {+ MatchedToolProviderViewData? toolProviderViewData+ = ToolsMenuItems.FirstOrDefault(+ item => string.Equals(item.Metadata.ProtocolName, toolProviderProtocolName, StringComparison.OrdinalIgnoreCase));++ if (toolProviderViewData is null)+ {+ toolProviderViewData+ = FooterMenuItems.FirstOrDefault(+ item => string.Equals(item.Metadata.ProtocolName, toolProviderProtocolName, StringComparison.OrdinalIgnoreCase));+ }++ await _thread.RunOnUIThreadAsync(() =>+ {+ SelectedMenuItem = toolProviderViewData;+ });+ return;+ }}++ await _thread.RunOnUIThreadAsync(() =>+ {+ SelectedMenuItem = ToolsMenuItems.FirstOrDefault() ?? FooterMenuItems.FirstOrDefault();+ });}- private void SetFooterMenuItems()+ private async Task UpdateMenuAsync(string? searchQuery){- FooterMenuItems.Clear();- foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetFooterTools())+ await TaskScheduler.Default;++ using (await _sempahore.WaitAsync(CancellationToken.None)){- FooterMenuItems.Add(- new MatchedToolProviderViewData(- matchedToolProvider.ToolProvider,- matchedToolProvider.MatchedSpans));+ var selectedMenuItem = SelectedMenuItem;++ bool firstTime = string.IsNullOrEmpty(searchQuery) && _allToolsMenuitems.Count == 0;++ var toolsMenuitems = new Dictionary<MatchedToolProviderViewData, MatchSpan[]?>();+ foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetTools(searchQuery))+ {+ MatchedToolProviderViewData item;+ MatchSpan[]? matchSpans = null;+ if (firstTime)+ {+ item+ = new MatchedToolProviderViewData(+ 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;+ }++ toolsMenuitems[item] = matchSpans;+ }++ var footerMenuItems = new List<MatchedToolProviderViewData>();+ if (FooterMenuItems.Count == 0)+ {+ foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetFooterTools())+ {+ footerMenuItems.Add(+ new MatchedToolProviderViewData(+ matchedToolProvider.Metadata,+ matchedToolProvider.ToolProvider,+ matchedToolProvider.MatchedSpans));+ }+ }++ await _thread.RunOnUIThreadAsync(() =>+ {+ var snapshot = ToolsMenuItems.ToArray();+ for (int i = 0; i < snapshot.Length; i++)+ {+ var item = snapshot[i];+ if (!toolsMenuitems.ContainsKey(item))+ {+ ToolsMenuItems.Remove(item);+ }+ }++ foreach (var item in toolsMenuitems)+ {+ if (!snapshot.Contains(item.Key))+ {+ ToolsMenuItems.Add(item.Key);+ }++ if (item.Value is not null)+ {+ item.Key.MatchedSpans = item.Value;+ }+ }++ footerMenuItems.ForEach(item => FooterMenuItems.Add(item));+ });}}}diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xamlindex 2dc2b384c..26ad62d61 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml@@ -65,20 +65,21 @@CompactModeThresholdWidth="450"ExpandedModeThresholdWidth="550"PaneDisplayMode="Auto"- SelectionFollowsFocus="Disabled"IsTabStop="False"MenuItemsSource="{x:Bind ViewModel.ToolsMenuItems}"- FooterMenuItemsSource="{x:Bind ViewModel.FooterMenuItems}">+ FooterMenuItemsSource="{x:Bind ViewModel.FooterMenuItems}"+ SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"><muxc:NavigationView.MenuItemTemplate><DataTemplate x:DataType="models:MatchedToolProviderViewData">- <muxc:NavigationViewItem Icon="{x:Bind Icon}">+ <muxc:NavigationViewItem+ Icon="{x:Bind Icon.Result}"><muxc:NavigationViewItem.ContextFlyout><MenuFlyout><MenuFlyoutItemText="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"Command="{Binding OpenToolInNewWindowCommand}"- CommandParameter="{x:Bind ToolProvider}">+ CommandParameter="{x:Bind Metadata}"><MenuFlyoutItem.Icon><FontIcon FontFamily="{StaticResource FluentSystemIcons}" Glyph="ø" /></MenuFlyoutItem.Icon>@@ -90,7 +91,7 @@IsTextSelectionEnabled="False"TextWrapping="NoWrap"TextTrimming="CharacterEllipsis"- ex:HighlighterExtension.Highlighters="{x:Bind MatchedSpans}">+ ex:HighlighterExtension.Highlighters="{x:Bind MatchedSpans, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"><Paragraph><Run Text="{x:Bind ToolProvider.DisplayName}"/></Paragraph>@@ -106,12 +107,6 @@QueryIcon="Find"PlaceholderText="{x:Bind ViewModel.Strings.Search}"Text="{x:Bind ViewModel.SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">- <i:Interaction.Behaviors>- <core:EventTriggerBehavior EventName="TextChanged">- <core:InvokeCommandAction- Command="{x:Bind ViewModel.SearchBoxTextChangedCommand}"/>- </core:EventTriggerBehavior>- </i:Interaction.Behaviors><AutoSuggestBox.KeyboardAccelerators><KeyboardAcceleratorKey="F"diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.csindex 2e0a3ad88..12e34575f 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs@@ -1,10 +1,8 @@#nullable enable-using DevTools.Core;using DevTools.Core.Navigation;using DevTools.Core.Threading;using DevTools.Impl.ViewModels;-using Windows.ApplicationModel.Core;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;using Windows.UI.Xaml.Navigation;@@ -41,13 +39,12 @@ namespace DevTools.Impl.Views{var parameters = (NavigationParameter)e.Parameter;- // Setup the title bar.- parameters.ExportProvider.Import<ITitleBar>().SetupTitleBarAsync().Forget();-// Set the view modelViewModel = parameters.ExportProvider.Import<MainPageViewModel>();DataContext = ViewModel;+ ViewModel.OnNavigatedToAsync(parameters.Parameter).Forget();+base.OnNavigatedTo(e);}diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.csindex a16f8baa3..ed6dba1c7 100644--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs@@ -1,5 +1,6 @@#nullable enable+using DevTools.Core.Threading;using DevTools.Localization;using DevTools.Providers;using Microsoft.Toolkit.Mvvm.ComponentModel;@@ -7,28 +8,47 @@ using Microsoft.UI.Xaml.Controls;using Microsoft.UI.Xaml.Controls.AnimatedVisuals;using System;using System.Composition;+using System.Threading.Tasks;using Windows.UI.Xaml;+using Windows.UI.Xaml.Controls;using Windows.UI.Xaml.Media;namespace DevTools.Impl.Views.Settings{[Export(typeof(IToolProvider))][Name("Settings")]+ [ProtocolName("settings")][IsFooterItem]internal sealed class SettingsToolProvider : ObservableRecipient, IToolProvider{+ private readonly IThread _thread;+public string DisplayName => LanguageManager.Instance.Settings.DisplayName;public object IconSource { get; }- = new AnimatedIcon- {- Source = new AnimatedSettingsVisualSource(),- FallbackIconSource = new FontIconSource- {- FontFamily = (FontFamily)Application.Current.Resources["FluentSystemIcons"],- Glyph = "\uF6A9"- }- };++ [ImportingConstructor]+ public SettingsToolProvider(IThread thread)+ {+ _thread = thread;++ IconSource+ = new TaskCompletionNotifier<IconElement>(+ _thread,+ _thread.RunOnUIThreadAsync(() =>+ {+ return Task.FromResult<IconElement>(+ new AnimatedIcon+ {+ Source = new AnimatedSettingsVisualSource(),+ FallbackIconSource = new Microsoft.UI.Xaml.Controls.FontIconSource+ {+ FontFamily = (FontFamily)Application.Current.Resources["FluentSystemIcons"],+ Glyph = "\uF6A9"+ }+ });+ }));+ }public bool CanBeTreatedByTool(string data){diff --git a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csprojindex 557d8338c..4808b49b4 100644--- a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj+++ b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj@@ -85,6 +85,10 @@<PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" /></ItemGroup><ItemGroup>+ <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">+ <Project>{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}</Project>+ <Name>DevTools.Core</Name>+ </ProjectReference><ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj"><Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project><Name>DevTools.Providers</Name>diff --git a/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs b/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.csindex f5055f5ea..6b74409ff 100644--- a/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs+++ b/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs@@ -21,10 +21,9 @@ namespace DevTools.Providers.Implpublic IEnumerable<MatchedToolProvider> GetTools(string? searchQuery){- searchQuery = searchQuery?.Trim();string[]? searchQueries = searchQuery?.Split(new char[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);- var results = new List<(MatchedToolProvider, ToolProviderMetadata)>();+ var results = new List<MatchedToolProvider>();foreach (Lazy<IToolProvider, ToolProviderMetadata> provider in _providers.Where(item => !item.Metadata.IsFooterItem)){var matches = new List<MatchSpan>();@@ -48,19 +47,22 @@ namespace DevTools.Providers.Impl}}- if (matches.Count > 0 || searchQueries?.Length == 0)+ if (matches.Count > 0 || searchQueries is null || searchQueries.Length == 0){- results.Add((new MatchedToolProvider(provider.Value, matches.ToArray()), provider.Metadata));+ results.Add(+ new MatchedToolProvider(+ provider.Metadata,+ provider.Value,+ matches.ToArray()));}}returnresults- .OrderByDescending(item => item.Item1.MatchedSpans.Length)- .ThenBy(item => item.Item2.Order ?? int.MaxValue)- .ThenBy(item => item.Item1.ToolProvider.DisplayName)- .ThenBy(item => item.Item2.Name)- .Select(item => item.Item1);+ .OrderByDescending(item => item.MatchedSpans.Length)+ .ThenBy(item => item.Metadata.Order ?? int.MaxValue)+ .ThenBy(item => item.ToolProvider.DisplayName)+ .ThenBy(item => item.Metadata.Name);}public IEnumerable<MatchedToolProvider> GetFooterTools()@@ -72,7 +74,7 @@ namespace DevTools.Providers.Impl.ThenBy(item => item.Value.DisplayName).ThenBy(item => item.Metadata.Name)){- yield return new MatchedToolProvider(provider.Value, matches);+ yield return new MatchedToolProvider(provider.Metadata, provider.Value, matches);}}}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.csindex 4cf2a4c81..49ec582d8 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs@@ -1,5 +1,6 @@#nullable enable+using DevTools.Core.Threading;using DevTools.Localization;using System;using System.Composition;@@ -8,14 +9,22 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder{[Export(typeof(IToolProvider))][Name("Base64 Encoder/Decoder")]+ [ProtocolName("base64")][Order(0)]internal sealed class Base64EncoderDecoderToolProvider : ToolProviderBase, IToolProvider{public string DisplayName => LanguageManager.Instance.Base64EncoderDecoder.DisplayName;public object IconSource { get; }- = CreatePathIconFromPath(- "M 0.008 0.008 L 0.008 31.992 L 31.992 31.992 L 31.992 0.008 Z M 2.916 2.916 L 29.084 2.916 L 29.084 29.084 L 2.916 29.084 Z M 11.957 10.094 L 8.777 13.774 C 7.823 14.87 7.276 16.273 7.276 17.727 L 7.276 18.18 C 7.276 20.169 8.924 21.816 10.912 21.816 L 12.366 21.816 C 14.353 21.816 16 20.169 16 18.18 C 16 16.193 14.353 14.546 12.366 14.546 L 11.957 14.546 L 14.137 12.002 Z M 21.816 10.184 L 21.816 14.546 L 20.362 14.546 L 20.362 10.231 L 17.454 10.231 L 17.454 17.454 L 21.816 17.454 L 21.816 21.816 L 24.722 21.816 L 24.722 10.184 Z M 10.276 17.454 L 12.366 17.454 C 12.781 17.454 13.092 17.766 13.092 18.18 C 13.092 18.595 12.781 18.908 12.366 18.908 L 10.912 18.908 C 10.497 18.908 10.184 18.595 10.184 18.18 L 10.184 17.727 C 10.184 17.629 10.264 17.55 10.276 17.454 Z");++ [ImportingConstructor]+ public Base64EncoderDecoderToolProvider(IThread thread)+ : base(thread)+ {+ IconSource+ = CreatePathIconFromPath(+ "M 0.008 0.008 L 0.008 31.992 L 31.992 31.992 L 31.992 0.008 Z M 2.916 2.916 L 29.084 2.916 L 29.084 29.084 L 2.916 29.084 Z M 11.957 10.094 L 8.777 13.774 C 7.823 14.87 7.276 16.273 7.276 17.727 L 7.276 18.18 C 7.276 20.169 8.924 21.816 10.912 21.816 L 12.366 21.816 C 14.353 21.816 16 20.169 16 18.18 C 16 16.193 14.353 14.546 12.366 14.546 L 11.957 14.546 L 14.137 12.002 Z M 21.816 10.184 L 21.816 14.546 L 20.362 14.546 L 20.362 10.231 L 17.454 10.231 L 17.454 17.454 L 21.816 17.454 L 21.816 21.816 L 24.722 21.816 L 24.722 10.184 Z M 10.276 17.454 L 12.366 17.454 C 12.781 17.454 13.092 17.766 13.092 18.18 C 13.092 18.595 12.781 18.908 12.366 18.908 L 10.912 18.908 C 10.497 18.908 10.184 18.595 10.184 18.18 L 10.184 17.727 C 10.184 17.629 10.264 17.55 10.276 17.454 Z");+ }public bool CanBeTreatedByTool(string data){diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.csindex 25418a149..ca0280e73 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs@@ -1,6 +1,9 @@#nullable enable+using DevTools.Core;+using DevTools.Core.Threading;using Microsoft.Toolkit.Mvvm.ComponentModel;+using System.Threading.Tasks;using Windows.UI.Xaml.Controls;using Windows.UI.Xaml.Markup;using Windows.UI.Xaml.Media;@@ -11,12 +14,24 @@ namespace DevTools.Providers.Impl.Tools{protected const string AssetsFolderPath = "ms-appx:///DevTools.Providers.Impl/Assets/";- protected static PathIcon CreatePathIconFromPath(string pathMarkup)+ private readonly IThread _thread;++ public ToolProviderBase(IThread thread)+ {+ _thread = Arguments.NotNull(thread, nameof(thread));+ }++ protected TaskCompletionNotifier<IconElement> CreatePathIconFromPath(string pathMarkup){- return new PathIcon- {- Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), pathMarkup)- };+ return new TaskCompletionNotifier<IconElement>(+ _thread,+ _thread.RunOnUIThreadAsync(() =>+ {+ return Task.FromResult<IconElement>(new PathIcon+ {+ Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), pathMarkup)+ });+ }));}}}diff --git a/src/dev/startup/DevTools.Startup/Package.appxmanifest b/src/dev/startup/DevTools.Startup/Package.appxmanifestindex e49b71914..60a4511cd 100644--- a/src/dev/startup/DevTools.Startup/Package.appxmanifest+++ b/src/dev/startup/DevTools.Startup/Package.appxmanifest@@ -7,61 +7,61 @@xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"IgnorableNamespaces="uap mp desktop4">- <Identity- Name="020c5ec9-262d-4acd-92d0-26ec6e869879"- Publisher="CN=ebaud"- Version="1.0.0.0" />+ <Identity+ Name="020c5ec9-262d-4acd-92d0-26ec6e869879"+ Publisher="CN=ebaud"+ Version="1.0.0.0" />- <!-- TODO: maybe we need to remove this when adding runFullTrust capability -->- <mp:PhoneIdentity PhoneProductId="c12088ee-f979-4809-8039-7851a3aa2b7a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>+ <!-- TODO: maybe we need to remove this when adding runFullTrust capability -->+ <mp:PhoneIdentity PhoneProductId="c12088ee-f979-4809-8039-7851a3aa2b7a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>- <Properties>- <DisplayName>DevTools</DisplayName>- <PublisherDisplayName>ebaud</PublisherDisplayName>- <Logo>Assets\Logo\StoreLogo.png</Logo>- </Properties>+ <Properties>+ <DisplayName>DevTools</DisplayName>+ <PublisherDisplayName>ebaud</PublisherDisplayName>+ <Logo>Assets\Logo\StoreLogo.png</Logo>+ </Properties>- <Dependencies>- <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />- <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />- </Dependencies>+ <Dependencies>+ <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />+ <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />+ </Dependencies>- <Resources>- <Resource Language="x-generate"/>- </Resources>+ <Resources>+ <Resource Language="x-generate"/>+ </Resources>- <Applications>- <Application Id="App"- Executable="$targetnametoken$.exe"- EntryPoint="$targetentrypoint$"- desktop4:SupportsMultipleInstances="true">- <uap:VisualElements- DisplayName="DevTools"- Description="DevTools"- BackgroundColor="transparent"- Square150x150Logo="Assets\Logo\Square150x150Logo.png"- Square44x44Logo="Assets\Logo\Square44x44Logo.png">- <uap:DefaultTile Wide310x150Logo="Assets\Logo\Wide310x150Logo.png" />- <uap:SplashScreen Image="Assets\Logo\SplashScreen.png" />- <uap:InitialRotationPreference>- <uap:Rotation Preference="landscape"/>- <uap:Rotation Preference="portrait"/>- <uap:Rotation Preference="landscapeFlipped"/>- <uap:Rotation Preference="portraitFlipped"/>- </uap:InitialRotationPreference>- </uap:VisualElements>- <Extensions>- <uap:Extension Category="windows.protocol">- <uap:Protocol Name="devtools">- <uap:DisplayName>DevTools URI Scheme</uap:DisplayName>- <uap:Logo>Assets\Logo\Square512.png</uap:Logo>- </uap:Protocol>- </uap:Extension>- </Extensions>- </Application>- </Applications>+ <Applications>+ <Application Id="App"+ Executable="$targetnametoken$.exe"+ EntryPoint="$targetentrypoint$"+ desktop4:SupportsMultipleInstances="true">+ <uap:VisualElements+ DisplayName="DevTools"+ Description="DevTools"+ BackgroundColor="transparent"+ Square150x150Logo="Assets\Logo\Square150x150Logo.png"+ Square44x44Logo="Assets\Logo\Square44x44Logo.png">+ <uap:DefaultTile Wide310x150Logo="Assets\Logo\Wide310x150Logo.png" />+ <uap:SplashScreen Image="Assets\Logo\SplashScreen.png" />+ <uap:InitialRotationPreference>+ <uap:Rotation Preference="landscape"/>+ <uap:Rotation Preference="portrait"/>+ <uap:Rotation Preference="landscapeFlipped"/>+ <uap:Rotation Preference="portraitFlipped"/>+ </uap:InitialRotationPreference>+ </uap:VisualElements>+ <Extensions>+ <uap:Extension Category="windows.protocol">+ <uap:Protocol ReturnResults="none" Name="devtools">+ <uap:DisplayName>DevTools URI Scheme</uap:DisplayName>+ <uap:Logo>Assets\Logo\Square512.png</uap:Logo>+ </uap:Protocol>+ </uap:Extension>+ </Extensions>+ </Application>+ </Applications>- <Capabilities>- <Capability Name="internetClient" />- </Capabilities>+ <Capabilities>+ <Capability Name="internetClient" />+ </Capabilities></Package>diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.csindex 00900b1dc..998520b20 100644--- a/src/dev/startup/DevTools/App.xaml.cs+++ b/src/dev/startup/DevTools/App.xaml.cs@@ -1,10 +1,12 @@#nullable enable+using DevTools.Core;using DevTools.Core.Impl.Injection;using DevTools.Core.Injection;using DevTools.Core.Navigation;using DevTools.Core.Settings;using DevTools.Core.Theme;+using DevTools.Core.Threading;using DevTools.Impl.Views;using DevTools.Localization;using DevTools.Providers;@@ -88,29 +90,7 @@ namespace DevTools/// <param name="e">Details about the launch request and process.</param>protected override void OnLaunched(LaunchActivatedEventArgs e){- ApplicationView applicationView = ApplicationView.GetForCurrentView();- applicationView.SetPreferredMinSize(new Windows.Foundation.Size(300, 200));-- // Do not repeat app initialization when the Window already has content,- // just ensure that the window is active- if (Window.Current.Content is not Frame rootFrame)- {- // Create a Frame to act as the navigation context and navigate to the first page- rootFrame = new Frame();-- rootFrame.NavigationFailed += OnNavigationFailed;-- if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)- {- //TODO: Load state from previously suspended application- }-- // Place the frame in the current Window- Window.Current.Content = rootFrame;- }-- _themeListener.Value.ThemeChanged += ThemeListener_ThemeChanged;- UpdateColorTheme();+ Frame rootFrame = EnsureWindowIsInitialized();if (e.PrelaunchActivated == false){@@ -122,8 +102,34 @@ namespace DevTools// When the navigation stack isn't restored navigate to the first page,// configuring the new page by passing required information as a navigation// parameter- rootFrame.Navigate(typeof(MainPage), new NavigationParameter(_mefComposer.ExportProvider.GetExport<IMefProvider>(), e.Arguments));+ rootFrame.Navigate(+ typeof(MainPage),+ new NavigationParameter(+ _mefComposer.ExportProvider.GetExport<IMefProvider>(),+ e.Arguments));}++ // Ensure the current window is active+ Window.Current.Activate();+ }+ }++ /// <summary>+ /// Invoked when the application is activated by some means other than normal launching.+ /// </summary>+ protected override void OnActivated(IActivatedEventArgs args)+ {+ Frame rootFrame = EnsureWindowIsInitialized();++ if (args.Kind == ActivationKind.Protocol)+ {+ var eventArgs = (ProtocolActivatedEventArgs)args;+ rootFrame.Navigate(+ typeof(MainPage),+ new NavigationParameter(+ _mefComposer.ExportProvider.GetExport<IMefProvider>(),+ eventArgs.Uri.Query));+// Ensure the current window is activeWindow.Current.Activate();}@@ -153,6 +159,29 @@ namespace DevToolsdeferral.Complete();}+ private Frame EnsureWindowIsInitialized()+ {+ ApplicationView applicationView = ApplicationView.GetForCurrentView();+ applicationView.SetPreferredMinSize(new Windows.Foundation.Size(300, 200));++ // Do not repeat app initialization when the Window already has content,+ // just ensure that the window is active+ if (Window.Current.Content is not Frame rootFrame)+ {+ // Create a Frame to act as the navigation context and navigate to the first page+ rootFrame = new Frame();+ rootFrame.NavigationFailed += OnNavigationFailed;++ // Place the frame in the current Window+ Window.Current.Content = rootFrame;+ }++ _themeListener.Value.ThemeChanged += ThemeListener_ThemeChanged;+ UpdateColorTheme();++ return rootFrame;+ }+private void ThemeListener_ThemeChanged(object sender, EventArgs e){UpdateColorTheme();@@ -172,6 +201,9 @@ namespace DevTools{frameworkElement.RequestedTheme = theme == AppTheme.Light ? ElementTheme.Light : ElementTheme.Dark;}++ // Setup the title bar.+ _mefComposer.ExportProvider.GetExport<ITitleBar>().SetupTitleBarAsync().Forget();}}}\ No newline at end of filediff --git a/src/tests/DevTools.Tests/Assets/LockScreenLogo.scale-200.png b/src/tests/DevTools.Tests/Assets/LockScreenLogo.scale-200.pngnew file mode 100644index 000000000..735f57adbBinary files /dev/null and b/src/tests/DevTools.Tests/Assets/LockScreenLogo.scale-200.png differdiff --git a/src/tests/DevTools.Tests/Assets/SplashScreen.scale-200.png b/src/tests/DevTools.Tests/Assets/SplashScreen.scale-200.pngnew file mode 100644index 000000000..023e7f1feBinary files /dev/null and b/src/tests/DevTools.Tests/Assets/SplashScreen.scale-200.png differdiff --git a/src/tests/DevTools.Tests/Assets/Square150x150Logo.scale-200.png b/src/tests/DevTools.Tests/Assets/Square150x150Logo.scale-200.pngnew file mode 100644index 000000000..af49fec1aBinary files /dev/null and b/src/tests/DevTools.Tests/Assets/Square150x150Logo.scale-200.png differdiff --git a/src/tests/DevTools.Tests/Assets/Square44x44Logo.scale-200.png b/src/tests/DevTools.Tests/Assets/Square44x44Logo.scale-200.pngnew file mode 100644index 000000000..ce342a2ecBinary files /dev/null and b/src/tests/DevTools.Tests/Assets/Square44x44Logo.scale-200.png differdiff --git a/src/tests/DevTools.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/tests/DevTools.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.pngnew file mode 100644index 000000000..f6c02ce97Binary files /dev/null and b/src/tests/DevTools.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differdiff --git a/src/tests/DevTools.Tests/Assets/StoreLogo.png b/src/tests/DevTools.Tests/Assets/StoreLogo.pngnew file mode 100644index 000000000..7385b56c0Binary files /dev/null and b/src/tests/DevTools.Tests/Assets/StoreLogo.png differdiff --git a/src/tests/DevTools.Tests/Assets/Wide310x150Logo.scale-200.png b/src/tests/DevTools.Tests/Assets/Wide310x150Logo.scale-200.pngnew file mode 100644index 000000000..288995b39Binary files /dev/null and b/src/tests/DevTools.Tests/Assets/Wide310x150Logo.scale-200.png differdiff --git a/src/tests/DevTools.Tests/DevTools.Tests.csproj b/src/tests/DevTools.Tests/DevTools.Tests.csprojnew file mode 100644index 000000000..7d11d1cba--- /dev/null+++ b/src/tests/DevTools.Tests/DevTools.Tests.csproj@@ -0,0 +1,150 @@+<?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>+ <ProjectGuid>{E1C4AB49-CFFF-420E-A182-E3028BD0493C}</ProjectGuid>+ <OutputType>AppContainerExe</OutputType>+ <AppDesignerFolder>Properties</AppDesignerFolder>+ <RootNamespace>DevTools.Tests</RootNamespace>+ <AssemblyName>DevTools.Tests</AssemblyName>+ <DefaultLanguage>en-US</DefaultLanguage>+ <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>+ <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>+ <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>+ <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>+ <FileAlignment>512</FileAlignment>+ <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>+ <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>+ <ItemGroup>+ <Compile Include="MefBaseTest.cs" />+ <Compile Include="Properties\AssemblyInfo.cs" />+ <Compile Include="UnitTestApp.xaml.cs">+ <DependentUpon>UnitTestApp.xaml</DependentUpon>+ </Compile>+ <Compile Include="Providers\IToolProviderFactoryTest.cs" />+ </ItemGroup>+ <ItemGroup>+ <ApplicationDefinition Include="UnitTestApp.xaml">+ <Generator>MSBuild:Compile</Generator>+ <SubType>Designer</SubType>+ </ApplicationDefinition>+ </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>+ <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />+ <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />+ <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />+ <PackageReference Include="MSTest.TestAdapter" Version="$(NuGet_MSTestTestAdapter)" />+ <PackageReference Include="MSTest.TestFramework" Version="$(NuGet_MSTestTestFramework)" />+ </ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\..\dev\def\DevTools.Core\DevTools.Core.csproj">+ <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>+ <Name>DevTools.Core</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\dev\def\DevTools.Providers\DevTools.Providers.csproj">+ <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>+ <Name>DevTools.Providers</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\dev\impl\DevTools.Core.Impl\DevTools.Core.Impl.csproj">+ <Project>{98274c08-4636-45ee-95af-2c069bfbabd4}</Project>+ <Name>DevTools.Core.Impl</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\dev\impl\DevTools.Impl\DevTools.Impl.csproj">+ <Project>{e2f0c303-04fc-4504-a272-7662af9a0a80}</Project>+ <Name>DevTools.Impl</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\dev\impl\DevTools.Localization\DevTools.Localization.csproj">+ <Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>+ <Name>DevTools.Localization</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\dev\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj">+ <Project>{8621ed11-e9dd-480a-be2b-c1db00919b6f}</Project>+ <Name>DevTools.Providers.Impl</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\dev\startup\DevTools\DevTools.csproj">+ <Project>{e3e4e200-b380-4207-9a7e-4c9421904502}</Project>+ <Name>DevTools</Name>+ </ProjectReference>+ </ItemGroup>+ <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>+ -->+</Project>\ No newline at end of filediff --git a/src/tests/DevTools.Tests/MefBaseTest.cs b/src/tests/DevTools.Tests/MefBaseTest.csnew file mode 100644index 000000000..faaeb8c79--- /dev/null+++ b/src/tests/DevTools.Tests/MefBaseTest.cs@@ -0,0 +1,59 @@+using DevTools.Core.Impl.Injection;+using DevTools.Core.Injection;+using DevTools.Localization;+using DevTools.Providers;+using System;+using System.Globalization;++namespace DevTools.Tests+{+ public abstract class MefBaseTest : IDisposable+ {+ private readonly MefComposer _mefComposer;++ private bool _isDisposed;++ protected IMefProvider ExportProvider { get; }++ public MefBaseTest()+ {+ // Do all the tests in English.+ LanguageManager.Instance.SetCurrentCulture(new CultureInfo("en"));++ _mefComposer+ = new MefComposer(+ typeof(MefComposer).Assembly,+ typeof(IToolProvider).Assembly,+ typeof(DevTools.Providers.Impl.Dummy).Assembly,+ typeof(Impl.Dummy).Assembly);++ ExportProvider = _mefComposer.ExportProvider.GetExport<IMefProvider>();+ }++ ~MefBaseTest()+ {+ Dispose(false);+ }++ public void Dispose()+ {+ Dispose(true);+ GC.SuppressFinalize(this);+ }++ protected virtual void Dispose(bool disposing)+ {+ if (_isDisposed)+ {+ return;+ }++ if (disposing)+ {+ _mefComposer.Dispose();+ }++ _isDisposed = true;+ }+ }+}diff --git a/src/tests/DevTools.Tests/Package.appxmanifest b/src/tests/DevTools.Tests/Package.appxmanifestnew file mode 100644index 000000000..963e6122e--- /dev/null+++ b/src/tests/DevTools.Tests/Package.appxmanifest@@ -0,0 +1,46 @@+<?xml version="1.0" encoding="utf-8"?>+<Package+ xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"+ xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"+ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"+ IgnorableNamespaces="uap mp">++ <Identity Name="b99a209c-7a2d-42fa-ba34-b16c8dee0379"+ Publisher="CN=etbaudou"+ Version="1.0.0.0" />++ <mp:PhoneIdentity PhoneProductId="b99a209c-7a2d-42fa-ba34-b16c8dee0379" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>++ <Properties>+ <DisplayName>DevTools.Tests</DisplayName>+ <PublisherDisplayName>etbaudou</PublisherDisplayName>+ <Logo>Assets\StoreLogo.png</Logo>+ </Properties>++ <Dependencies>+ <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />+ </Dependencies>++ <Resources>+ <Resource Language="x-generate" />+ </Resources>+ <Applications>+ <Application Id="vstest.executionengine.universal.App"+ Executable="$targetnametoken$.exe"+ EntryPoint="DevTools.Tests.App">+ <uap:VisualElements+ DisplayName="DevTools.Tests"+ Square150x150Logo="Assets\Square150x150Logo.png"+ Square44x44Logo="Assets\Square44x44Logo.png"+ Description="DevTools.Tests"+ BackgroundColor="transparent">+ <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>+ <uap:SplashScreen Image="Assets\SplashScreen.png" />+ </uap:VisualElements>+ </Application>+ </Applications>+ <Capabilities>+ <Capability Name="internetClientServer" />+ <Capability Name="privateNetworkClientServer" />+ </Capabilities>+</Package>\ No newline at end of filediff --git a/src/tests/DevTools.Tests/Properties/AssemblyInfo.cs b/src/tests/DevTools.Tests/Properties/AssemblyInfo.csnew file mode 100644index 000000000..a287e88e7--- /dev/null+++ b/src/tests/DevTools.Tests/Properties/AssemblyInfo.cs@@ -0,0 +1,18 @@+using System.Reflection;+using System.Runtime.CompilerServices;+using System.Runtime.InteropServices;++[assembly: AssemblyTitle("DevTools.Tests")]+[assembly: AssemblyDescription("")]+[assembly: AssemblyConfiguration("")]+[assembly: AssemblyCompany("")]+[assembly: AssemblyProduct("DevTools.Tests")]+[assembly: AssemblyCopyright("Copyright © 2021")]+[assembly: AssemblyTrademark("")]+[assembly: AssemblyCulture("")]+[assembly: AssemblyMetadata("TargetPlatform","UAP")]++// [assembly: AssemblyVersion("1.0.*")]+[assembly: AssemblyVersion("1.0.0.0")]+[assembly: AssemblyFileVersion("1.0.0.0")]+[assembly: ComVisible(false)]\ No newline at end of filediff --git a/src/tests/DevTools.Tests/Properties/Default.rd.xml b/src/tests/DevTools.Tests/Properties/Default.rd.xmlnew file mode 100644index 000000000..996a8392a--- /dev/null+++ b/src/tests/DevTools.Tests/Properties/Default.rd.xml@@ -0,0 +1,29 @@+<!--+ This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most+ developers. However, you can modify these parameters to modify the behavior of the .NET Native+ optimizer.++ Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919++ To fully enable reflection for App1.MyClass and all of its public/private members+ <Type Name="App1.MyClass" Dynamic="Required All"/>++ To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32+ <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />++ Using the Namespace directive to apply reflection policy to all the types in a particular namespace+ <Namespace Name="DataClasses.ViewModels" Serialize="All" />+-->++<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">+ <Application>+ <!--+ An Assembly element with Name="*Application*" applies to all assemblies in+ the application package. The asterisks are not wildcards.+ -->+ <Assembly Name="*Application*" Dynamic="Required All" />+ <!-- Add your application specific runtime directives here. -->+++ </Application>+</Directives>\ No newline at end of filediff --git a/src/tests/DevTools.Tests/Providers/IToolProviderFactoryTest.cs b/src/tests/DevTools.Tests/Providers/IToolProviderFactoryTest.csnew file mode 100644index 000000000..b7001d9a7--- /dev/null+++ b/src/tests/DevTools.Tests/Providers/IToolProviderFactoryTest.cs@@ -0,0 +1,25 @@+using DevTools.Providers;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using System.Linq;++namespace DevTools.Tests.Providers+{+ [TestClass]+ public class IToolProviderFactoryTest : MefBaseTest+ {+ [DataTestMethod]+ [DataRow(null, 0)]+ [DataRow("", 0)]+ [DataRow(" ", 0)]+ [DataRow("e", 5)]+ [DataRow("encoder", 1)]+ [DataRow("ENCODER", 1)]+ [DataRow("ENCODER ", 1)]+ public void GetTools(string searchquery, int expectedMatchSpanCount)+ {+ var result = ExportProvider.Import<IToolProviderFactory>().GetTools(searchquery);+ var base64Tool = result.First(item => item.Metadata.ProtocolName == "base64");+ Assert.AreEqual(expectedMatchSpanCount, base64Tool.MatchedSpans.Length);+ }+ }+}diff --git a/src/tests/DevTools.Tests/UnitTestApp.xaml b/src/tests/DevTools.Tests/UnitTestApp.xamlnew file mode 100644index 000000000..35588fd9d--- /dev/null+++ b/src/tests/DevTools.Tests/UnitTestApp.xaml@@ -0,0 +1,7 @@+<Application+ x:Class="DevTools.Tests.App"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:local="using:DevTools.Tests">++</Application>diff --git a/src/tests/DevTools.Tests/UnitTestApp.xaml.cs b/src/tests/DevTools.Tests/UnitTestApp.xaml.csnew file mode 100644index 000000000..572e8d079--- /dev/null+++ b/src/tests/DevTools.Tests/UnitTestApp.xaml.cs@@ -0,0 +1,101 @@+using System;+using System.Collections.Generic;+using System.IO;+using System.Linq;+using System.Runtime.InteropServices.WindowsRuntime;+using Windows.ApplicationModel;+using Windows.ApplicationModel.Activation;+using Windows.Foundation;+using Windows.Foundation.Collections;+using Windows.UI.Xaml;+using Windows.UI.Xaml.Controls;+using Windows.UI.Xaml.Controls.Primitives;+using Windows.UI.Xaml.Data;+using Windows.UI.Xaml.Input;+using Windows.UI.Xaml.Media;+using Windows.UI.Xaml.Navigation;++namespace DevTools.Tests+{+ /// <summary>+ /// Provides application-specific behavior to supplement the default Application class.+ /// </summary>+ sealed partial class App : Application+ {+ /// <summary>+ /// Initializes the singleton application object. This is the first line of authored code+ /// executed, and as such is the logical equivalent of main() or WinMain().+ /// </summary>+ public App()+ {+ this.InitializeComponent();+ this.Suspending += OnSuspending;+ }++ /// <summary>+ /// Invoked when the application is launched normally by the end user. Other entry points+ /// will be used such as when the application is launched to open a specific file.+ /// </summary>+ /// <param name="e">Details about the launch request and process.</param>+ protected override void OnLaunched(LaunchActivatedEventArgs e)+ {+#if DEBUG+ if (System.Diagnostics.Debugger.IsAttached)+ {+ this.DebugSettings.EnableFrameRateCounter = true;+ }++#endif+++ // Do not repeat app initialization when the Window already has content,+ // just ensure that the window is active+ if (Window.Current.Content is not Frame rootFrame)+ {+ // Create a Frame to act as the navigation context and navigate to the first page+ rootFrame = new Frame();++ rootFrame.NavigationFailed += OnNavigationFailed;++ if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)+ {+ //TODO: Load state from previously suspended application+ }++ // Place the frame in the current Window+ Window.Current.Content = rootFrame;+ }++ Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();++ // Ensure the current window is active+ Window.Current.Activate();++ Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments);+ }++ /// <summary>+ /// Invoked when Navigation to a certain page fails+ /// </summary>+ /// <param name="sender">The Frame which failed navigation</param>+ /// <param name="e">Details about the navigation failure</param>+ void OnNavigationFailed(object sender, NavigationFailedEventArgs e)+ {+ throw new Exception("Failed to load Page " + e.SourcePageType.FullName);+ }++ /// <summary>+ /// Invoked when application execution is being suspended. Application state is saved+ /// without knowing whether the application will be terminated or resumed with the contents+ /// of memory still intact.+ /// </summary>+ /// <param name="sender">The source of the suspend request.</param>+ /// <param name="e">Details about the suspend request.</param>+ private void OnSuspending(object sender, SuspendingEventArgs e)+ {+ var deferral = e.SuspendingOperation.GetDeferral();+ //TODO: Save application state and stop any background activity+ deferral.Complete();+ }+ }+}